sts-sponsors team mailing list archive

[Alberto Donato <mp+435966@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:script-timeout-flaky-test into maas:master.

Commit message:
fix flaky ScriptResult test due to Script.timeout=0



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/435966
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/src/metadataserver/models/tests/test_scriptresult.py b/src/metadataserver/models/tests/test_scriptresult.py
index 77fd40c..7675ace 100644
--- a/src/metadataserver/models/tests/test_scriptresult.py
+++ b/src/metadataserver/models/tests/test_scriptresult.py
@@ -695,8 +695,9 @@ class TestScriptResult(MAASServerTestCase):
 
     def test_estimated_runtime_uses_timeout(self):
         now = datetime.now()
+        script = factory.make_Script(timeout=timedelta(10))
         script_result = factory.make_ScriptResult(
-            status=SCRIPT_STATUS.RUNNING, started=now
+            script=script, status=SCRIPT_STATUS.RUNNING, started=now
         )
         expected = str(
             script_result.script.timeout
@@ -706,11 +707,10 @@ class TestScriptResult(MAASServerTestCase):
 
     def test_estimated_runtime_returns_Unknown(self):
         now = datetime.now()
+        script = factory.make_Script(timeout=timedelta(0))
         script_result = factory.make_ScriptResult(
-            status=SCRIPT_STATUS.RUNNING, started=now
+            script=script, status=SCRIPT_STATUS.RUNNING, started=now
         )
-        script_result.script.timeout = timedelta(0)
-        script_result.script.save()
         self.assertEqual("Unknown", script_result.estimated_runtime)
 
     def test_read_results(self):