- backported r116951 from trunk

doc/CHANGES.rst

@@ -11,6 +11,8 @@ http://docs.zope.org/zope2/releases/.
 Bugs Fixed
 ++++++++++
 
+- Fixed unit test that failed on fast Windows machines.
+
 - LP #642728: Fixed TypeError on nested multi part messages in MailHost.
 
 Features Added

src/OFS/tests/testHistory.py

@@ -5,6 +5,7 @@ Zope2.startup()
 
 import os
 import shutil
+import time
 import transaction
 import tempfile
 import ZODB
@@ -35,10 +36,12 @@ class HistoryTests(unittest.TestCase):
         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')