Skip to content

Commit

Permalink
Let checkQuickVerificationWith2Clients use a longer timeaut and raise…
Browse files Browse the repository at this point in the history
… an assertion error if the timeout fails. Trying to debug intermittant failures on Travis, seen in all versions of Python.
  • Loading branch information
jamadden committed May 22, 2015
1 parent e57c61d commit b53a102
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/ZEO/tests/ConnectionTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def tearDown(self):
os.waitpid(pid, 0)
except OSError:
pass # The subprocess module may already have waited

for c in self.caches:
for i in 0, 1:
for ext in "", ".trace", ".lock":
Expand Down Expand Up @@ -619,8 +619,9 @@ def checkQuickVerificationWith2Clients(self):
perstorage = self.openClientStorage(cache="test")

forker.wait_until(
(lambda : perstorage.verify_result == "quick verification"),
onfail=(lambda : None))
func=(lambda : perstorage.verify_result == "quick verification"),
timeout=60,
label="perstorage.verify_result to be quick verification")

self.assertEqual(perstorage.verify_result, "quick verification")
self.assertEqual(perstorage._server._last_invals,
Expand Down Expand Up @@ -1119,7 +1120,7 @@ def checkTimeoutProvokingConflicts(self):
self.assertRaises(ConflictError, storage.tpc_vote, t)
# Abort this one and try a transaction that should succeed.
storage.tpc_abort(t)

# Now do a store.
obj.value = 11
t = Transaction()
Expand Down

0 comments on commit b53a102

Please sign in to comment.