[Zope-Checkins] SVN: Zope/branches/2.12/ - backported r116951 from trunk

[Yvo Schubbe]

Log message for revision 116952:
  - backported r116951 from trunk

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/OFS/tests/testHistory.py

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst	2010-09-26 09:34:29 UTC (rev 116951)
+++ Zope/branches/2.12/doc/CHANGES.rst	2010-09-26 09:47:32 UTC (rev 116952)
@@ -11,6 +11,8 @@
 Bugs Fixed
 ++++++++++
 
+- Fixed unit test that failed on fast Windows machines.
+
 - LP #642728: Fixed TypeError on nested multi part messages in MailHost.
 
 Features Added

Modified: Zope/branches/2.12/src/OFS/tests/testHistory.py
===================================================================
--- Zope/branches/2.12/src/OFS/tests/testHistory.py	2010-09-26 09:34:29 UTC (rev 116951)
+++ Zope/branches/2.12/src/OFS/tests/testHistory.py	2010-09-26 09:47:32 UTC (rev 116952)
@@ -5,6 +5,7 @@
 
 import os
 import shutil
+import time
 import transaction
 import tempfile
 import ZODB
@@ -35,10 +36,12 @@
         t.description = None 
         t.note('Change 1')
         t.commit()
+        time.sleep(0.02) # wait at least one Windows clock tick
         ps.write('return 2')
         t = transaction.get()
         t.note('Change 2')
         t.commit()
+        time.sleep(0.02) # wait at least one Windows clock tick
         ps.write('return 3')
         t = transaction.get()
         t.note('Change 3')