Commit 01d1b9be authored by 's avatar

- backported r116951 from trunk

parent 6e6ff681
...@@ -11,6 +11,8 @@ http://docs.zope.org/zope2/releases/. ...@@ -11,6 +11,8 @@ http://docs.zope.org/zope2/releases/.
Bugs Fixed Bugs Fixed
++++++++++ ++++++++++
- Fixed unit test that failed on fast Windows machines.
- LP #642728: Fixed TypeError on nested multi part messages in MailHost. - LP #642728: Fixed TypeError on nested multi part messages in MailHost.
Features Added Features Added
......
...@@ -5,6 +5,7 @@ Zope2.startup() ...@@ -5,6 +5,7 @@ Zope2.startup()
import os import os
import shutil import shutil
import time
import transaction import transaction
import tempfile import tempfile
import ZODB import ZODB
...@@ -35,10 +36,12 @@ class HistoryTests(unittest.TestCase): ...@@ -35,10 +36,12 @@ class HistoryTests(unittest.TestCase):
t.description = None t.description = None
t.note('Change 1') t.note('Change 1')
t.commit() t.commit()
time.sleep(0.02) # wait at least one Windows clock tick
ps.write('return 2') ps.write('return 2')
t = transaction.get() t = transaction.get()
t.note('Change 2') t.note('Change 2')
t.commit() t.commit()
time.sleep(0.02) # wait at least one Windows clock tick
ps.write('return 3') ps.write('return 3')
t = transaction.get() t = transaction.get()
t.note('Change 3') t.note('Change 3')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment