Give even more time to tests to pass. Prevent false negatives.

parent d988134e
...@@ -686,7 +686,7 @@ class TestSlapgridCPWithMasterWatchdog(MasterMixin, unittest.TestCase): ...@@ -686,7 +686,7 @@ class TestSlapgridCPWithMasterWatchdog(MasterMixin, unittest.TestCase):
self.assertSortedListEqual( self.assertSortedListEqual(
os.listdir(partition.partition_path), os.listdir(partition.partition_path),
['.0_daemon.log','worked', 'buildout.cfg', 'etc']) ['.0_daemon.log','worked', 'buildout.cfg', 'etc'])
tries = 50 tries = 200
daemon_log = os.path.join(partition.partition_path, '.0_daemon.log') daemon_log = os.path.join(partition.partition_path, '.0_daemon.log')
while tries > 0: while tries > 0:
tries -= 1 tries -= 1
...@@ -694,7 +694,7 @@ class TestSlapgridCPWithMasterWatchdog(MasterMixin, unittest.TestCase): ...@@ -694,7 +694,7 @@ class TestSlapgridCPWithMasterWatchdog(MasterMixin, unittest.TestCase):
break break
time.sleep(0.1) time.sleep(0.1)
self.assertTrue('Failing' in open(daemon_log, 'r').read()) self.assertTrue('Failing' in open(daemon_log, 'r').read())
tries = 25 tries = 200
while tries > 0: while tries > 0:
tries -= 1 tries -= 1
if os.path.exists(self.watchdog_banged): if os.path.exists(self.watchdog_banged):
...@@ -735,7 +735,7 @@ touch worked ...@@ -735,7 +735,7 @@ touch worked
'var']) 'var'])
self.assertSortedListEqual(os.listdir(partition.partition_path), self.assertSortedListEqual(os.listdir(partition.partition_path),
['.0_daemon.log','worked', 'buildout.cfg', 'etc']) ['.0_daemon.log','worked', 'buildout.cfg', 'etc'])
tries = 50 tries = 200
daemon_log = os.path.join(partition.partition_path, '.0_daemon.log') daemon_log = os.path.join(partition.partition_path, '.0_daemon.log')
while tries > 0: while tries > 0:
tries -= 1 tries -= 1
...@@ -743,7 +743,7 @@ touch worked ...@@ -743,7 +743,7 @@ touch worked
break break
time.sleep(0.1) time.sleep(0.1)
self.assertTrue('Failing' in open(daemon_log, 'r').read()) self.assertTrue('Failing' in open(daemon_log, 'r').read())
tries = 50 tries = 200
while tries > 0: while tries > 0:
tries -= 1 tries -= 1
if os.path.exists(self.watchdog_banged): if os.path.exists(self.watchdog_banged):
...@@ -1232,7 +1232,7 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase): ...@@ -1232,7 +1232,7 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase):
['0', 'etc', 'var']) ['0', 'etc', 'var'])
self.assertSortedListEqual(os.listdir(instance.partition_path), self.assertSortedListEqual(os.listdir(instance.partition_path),
['.0_wrapper.log', 'worked', 'buildout.cfg', 'etc']) ['.0_wrapper.log', 'worked', 'buildout.cfg', 'etc'])
tries = 20 tries = 50
wrapper_log = os.path.join(instance.partition_path, '.0_wrapper.log') wrapper_log = os.path.join(instance.partition_path, '.0_wrapper.log')
while tries > 0: while tries > 0:
tries -= 1 tries -= 1
...@@ -1268,7 +1268,7 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase): ...@@ -1268,7 +1268,7 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase):
'var']) 'var'])
self.assertSortedListEqual(os.listdir(instance.partition_path), self.assertSortedListEqual(os.listdir(instance.partition_path),
['.0_wrapper.log', 'worked', 'buildout.cfg', 'etc']) ['.0_wrapper.log', 'worked', 'buildout.cfg', 'etc'])
tries = 20 tries = 50
wrapper_log = os.path.join(instance.partition_path, '.0_wrapper.log') wrapper_log = os.path.join(instance.partition_path, '.0_wrapper.log')
while tries > 0: while tries > 0:
tries -= 1 tries -= 1
......
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