Commit 2048688b authored by Łukasz Nowak's avatar Łukasz Nowak

grid: Increase default promise timeout to 20 s

It is the most used value in most scenarios.
parent 4b1de2dd
...@@ -79,7 +79,7 @@ COMPUTER_PARTITION_STOPPED_STATE = 'stopped' ...@@ -79,7 +79,7 @@ COMPUTER_PARTITION_STOPPED_STATE = 'stopped'
SLAPGRID_SUCCESS = 0 SLAPGRID_SUCCESS = 0
SLAPGRID_FAIL = 1 SLAPGRID_FAIL = 1
SLAPGRID_PROMISE_FAIL = 2 SLAPGRID_PROMISE_FAIL = 2
PROMISE_TIMEOUT = 3 PROMISE_TIMEOUT = 20
COMPUTER_PARTITION_TIMESTAMP_FILENAME = '.timestamp' COMPUTER_PARTITION_TIMESTAMP_FILENAME = '.timestamp'
COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME = '.slapos_latest_bang_timestamp' COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME = '.slapos_latest_bang_timestamp'
......
...@@ -2040,7 +2040,7 @@ class TestSlapgridCPWithMasterPromise(MasterMixin, unittest.TestCase): ...@@ -2040,7 +2040,7 @@ class TestSlapgridCPWithMasterPromise(MasterMixin, unittest.TestCase):
f.write(textwrap.dedent("""\ f.write(textwrap.dedent("""\
#!/usr/bin/env sh #!/usr/bin/env sh
touch "%s" touch "%s"
sleep 5 sleep 25
exit 0""" % worked_file)) exit 0""" % worked_file))
os.chmod(succeed, 0o777) os.chmod(succeed, 0o777)
self.assertEqual(self.grid.processComputerPartitionList(), self.assertEqual(self.grid.processComputerPartitionList(),
...@@ -2114,7 +2114,7 @@ class TestSlapgridCPWithMasterPromise(MasterMixin, unittest.TestCase): ...@@ -2114,7 +2114,7 @@ class TestSlapgridCPWithMasterPromise(MasterMixin, unittest.TestCase):
then then
touch "%(lockfile)s" touch "%(lockfile)s"
else else
sleep 5 sleep 25
fi fi
exit 0""" % { exit 0""" % {
'worked_file': worked_file, 'worked_file': worked_file,
...@@ -3261,7 +3261,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase): ...@@ -3261,7 +3261,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase):
f.write(textwrap.dedent("""\ f.write(textwrap.dedent("""\
#!/usr/bin/env sh #!/usr/bin/env sh
touch "%s" touch "%s"
sleep 5 sleep 25
exit 0""" % worked_file)) exit 0""" % worked_file))
os.chmod(succeed, 0o777) os.chmod(succeed, 0o777)
self.assertEqual(self.grid.processPromiseList(), self.assertEqual(self.grid.processPromiseList(),
...@@ -3278,7 +3278,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase): ...@@ -3278,7 +3278,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase):
with open("%s", 'a'): with open("%s", 'a'):
os.utime("%s", None) os.utime("%s", None)
import time import time
time.sleep(7)""" % (worked_file, worked_file) time.sleep(27)""" % (worked_file, worked_file)
instance.setPluginPromise(promise_name='timeout_fail.py', success=True, promise_content=fail) instance.setPluginPromise(promise_name='timeout_fail.py', success=True, promise_content=fail)
self.assertEqual(self.grid.processPromiseList(), self.assertEqual(self.grid.processPromiseList(),
slapos.grid.slapgrid.SLAPGRID_PROMISE_FAIL) slapos.grid.slapgrid.SLAPGRID_PROMISE_FAIL)
...@@ -3286,7 +3286,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase): ...@@ -3286,7 +3286,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase):
with open(os.path.join(instance.partition_path, ".slapgrid/promise/result/timeout_fail.status.json"), "r") as f: with open(os.path.join(instance.partition_path, ".slapgrid/promise/result/timeout_fail.status.json"), "r") as f:
result = json.loads(f.read()) result = json.loads(f.read())
self.assertEqual('Error: Promise timed out after 3 seconds', self.assertEqual('Error: Promise timed out after 20 seconds',
result["result"]["message"]) result["result"]["message"])
def test_two_succeeding_promises(self): def test_two_succeeding_promises(self):
...@@ -3422,7 +3422,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase): ...@@ -3422,7 +3422,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase):
then then
touch "%(lockfile)s" touch "%(lockfile)s"
else else
sleep 5 sleep 25
fi fi
exit 0""" % { exit 0""" % {
'worked_file': worked_file, 'worked_file': worked_file,
...@@ -3450,7 +3450,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase): ...@@ -3450,7 +3450,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase):
with open("%s", 'a'): with open("%s", 'a'):
os.utime("%s", None) os.utime("%s", None)
import time import time
time.sleep(7)""" % (timeout_file, timeout_file) time.sleep(27)""" % (timeout_file, timeout_file)
instance.setPluginPromise(promise_name='timeout_fail.py', success=True, promise_content=fail) instance.setPluginPromise(promise_name='timeout_fail.py', success=True, promise_content=fail)
self.assertEqual(self.grid.processPromiseList(), self.assertEqual(self.grid.processPromiseList(),
...@@ -3465,7 +3465,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase): ...@@ -3465,7 +3465,7 @@ class TestSlapgridPromiseWithMaster(MasterMixin, unittest.TestCase):
with open(os.path.join(instance.partition_path, ".slapgrid/promise/result/timeout_fail.status.json"), "r") as f: with open(os.path.join(instance.partition_path, ".slapgrid/promise/result/timeout_fail.status.json"), "r") as f:
result = json.loads(f.read()) result = json.loads(f.read())
self.assertEqual('Error: Promise timed out after 3 seconds', self.assertEqual('Error: Promise timed out after 20 seconds',
result["result"]["message"]) result["result"]["message"])
def test_promise_notrun_if_partition_stopped(self): def test_promise_notrun_if_partition_stopped(self):
......
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