← Back to team overview

sts-sponsors team mailing list archive

[Merge] ~ack/maas:script-result-assertion-message into maas:master

 

Alberto Donato has proposed merging ~ack/maas:script-result-assertion-message into maas:master.

Commit message:
add message to assertion on script result status for debugging



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/442068
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:script-result-assertion-message into maas:master.
diff --git a/src/maasserver/models/scriptresult.py b/src/maasserver/models/scriptresult.py
index cdd89f3..cda4bc3 100644
--- a/src/maasserver/models/scriptresult.py
+++ b/src/maasserver/models/scriptresult.py
@@ -264,9 +264,11 @@ class ScriptResult(CleanSave, TimestampedModel):
         # rack controller to create a new ScriptSet.
         if self.script_set.node.is_commissioning():
             # Allow PENDING, APPLYING_NETCONF, INSTALLING, and RUNNING scripts
-            # incase the node didn't inform MAAS the Script was being run, it
+            # in case the node didn't inform MAAS the Script was being run, it
             # just uploaded results.
-            assert self.status in SCRIPT_STATUS_RUNNING_OR_PENDING
+            assert (
+                self.status in SCRIPT_STATUS_RUNNING_OR_PENDING
+            ), f"Status for scriptresult {self.id} is not running or pending ({self.status})"
 
         if timedout:
             self.status = SCRIPT_STATUS.TIMEDOUT

Follow ups