Merge ~ltrager/maas:lp1851620 into maas:master

[Lee Trager]

LP: #1851620 - Ensure all pending and running tests are aborted on failure.

7c2400e... by Lee Trager on 2019-11-07

make format

[Alberto Donato (ack)]

lgtm

review: Approve

diff --git a/src/metadataserver/api.py b/src/metadataserver/api.py
index b359714..be64159 100644
--- a/src/metadataserver/api.py
+++ b/src/metadataserver/api.py
@@ -60,7 +60,10 @@ from maasserver.models import (
 from maasserver.models.event import Event
 from maasserver.models.tag import Tag
 from maasserver.models.timestampedmodel import now
-from maasserver.node_status import NODE_TESTING_RESET_READY_TRANSITIONS
+from maasserver.node_status import (
+    FAILED_STATUSES,
+    NODE_TESTING_RESET_READY_TRANSITIONS,
+)
 from maasserver.populate_tags import populate_tags_for_single_node
 from maasserver.preseed import (
     get_curtin_userdata,
@@ -815,6 +818,15 @@ class VersionIndexHandler(MetadataViewHandler):
         if target_status in (None, node.status):
             # No status change.  Nothing to be done.
             return rc.ALL_OK
+        elif target_status in FAILED_STATUSES:
+            ScriptResult.objects.filter(
+                script_set__in=[
+                    node.current_commissioning_script_set,
+                    node.current_testing_script_set,
+                    node.current_installation_script_set,
+                ],
+                status__in=SCRIPT_STATUS_RUNNING_OR_PENDING,
+            ).update(status=SCRIPT_STATUS.ABORTED, updated=now())
 
         # Only machines can change their status. This is to allow controllers
         # to send refresh data without having their status changed to READY.
diff --git a/src/metadataserver/tests/test_api.py b/src/metadataserver/tests/test_api.py
index 5846999..ce0794a 100644
--- a/src/metadataserver/tests/test_api.py
+++ b/src/metadataserver/tests/test_api.py
@@ -2931,6 +2931,12 @@ class TestTestingAPI(MAASServerTestCase):
             NODE_STATUS.FAILED_TESTING, reload_object(node).status
         )
         self.assertEqual(event.type.name, EVENT_TYPES.FAILED_TESTING)
+        self.assertEquals(
+            SCRIPT_STATUS.ABORTED, node.current_commissioning_script_set.status
+        )
+        self.assertEquals(
+            SCRIPT_STATUS.ABORTED, node.current_testing_script_set.status
+        )
 
     def test_signaling_testing_testing_transitions_to_testing(self):
         node = factory.make_Node(