Commit 4544d8aa authored by Jim Fulton's avatar Jim Fulton

A couple of tests made timing assumptions that sometimes weren't

satisfied.  Added waits to make the assumtions more explicit and to
try to make sure they were satisfied.
parent 3776723f
...@@ -639,7 +639,10 @@ class InvqTests(CommonSetupTearDown): ...@@ -639,7 +639,10 @@ class InvqTests(CommonSetupTearDown):
# message is generated # message is generated
revid = self._dostore(oid) revid = self._dostore(oid)
revid = self._dostore(oid, revid) revid = self._dostore(oid, revid)
forker.wait_until(
lambda :
perstorage.lastTransaction() == self._storage.lastTransaction()
)
perstorage.load(oid, '') perstorage.load(oid, '')
perstorage.close() perstorage.close()
...@@ -859,12 +862,13 @@ class ReconnectionTests(CommonSetupTearDown): ...@@ -859,12 +862,13 @@ class ReconnectionTests(CommonSetupTearDown):
# do two storages of the object to make sure an invalidation # do two storages of the object to make sure an invalidation
# message is generated # message is generated
revid = self._dostore(oid) revid = self._dostore(oid)
self._dostore(oid, revid) revid = self._dostore(oid, revid)
forker.wait_until(
lambda :
perstorage.lastTransaction() == self._storage.lastTransaction()
)
perstorage.load(oid, '') perstorage.load(oid, '')
self.shutdownServer() self.shutdownServer()
self.pollDown() self.pollDown()
self._storage.verify_result = None self._storage.verify_result = None
perstorage.verify_result = None perstorage.verify_result = None
......
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