Merge ~adam-collard/maas-ci/+git/system-tests:lxd-vm-bug into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

wait_for_{,new_}machine: use machine name not hostname for error

Test run in http://maas-integration-ci.internal:8080/job/maas-system-tests-snap/955/

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-vm-bug lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: de8373d48cf0a1a4d1bfc87205f3d0fa155dbcde

review: Approve

[Jack Lloyd-Walters (lloydwaltersj)]

looks good

review: Approve

diff --git a/systemtests/conftest.py b/systemtests/conftest.py
index cccd490..e669a69 100644
--- a/systemtests/conftest.py
+++ b/systemtests/conftest.py
@@ -190,6 +190,7 @@ def hardware_sync_machine(
         machine,
         status="Ready",
         abort_status="Releasing failed",
+        machine_id=machine_config.name,
         timeout=40 * 60,
         delay=10,
     )
diff --git a/systemtests/env_builder/test_basic.py b/systemtests/env_builder/test_basic.py
index f6e91f6..f346095 100644
--- a/systemtests/env_builder/test_basic.py
+++ b/systemtests/env_builder/test_basic.py
@@ -158,10 +158,7 @@ class TestSetup:
                     ), f"Don't know how to handle lxd_vm status: {vm_details['status']}"
 
             _boot_vm(vm_name)
-            machine = wait_for_new_machine(
-                maas_api_client,
-                mac_address,
-            )
+            machine = wait_for_new_machine(maas_api_client, mac_address, vm_name)
 
         # Make sure we have power parameters set
         if not machine["power_type"]:
@@ -177,6 +174,7 @@ class TestSetup:
                 machine,
                 status="Ready",
                 abort_status="Failed commissioning",
+                machine_id=vm_name,
                 timeout=20 * 60,
             )
         assert machine["status_name"] == "Ready"
diff --git a/systemtests/tests_per_machine/test_hardware_sync.py b/systemtests/tests_per_machine/test_hardware_sync.py
index 636d72b..05533c3 100644
--- a/systemtests/tests_per_machine/test_hardware_sync.py
+++ b/systemtests/tests_per_machine/test_hardware_sync.py
@@ -133,6 +133,7 @@ def test_hardware_sync(
         hardware_sync_machine.machine,
         status="Deployed",
         abort_status="Failed deployment",
+        machine_id=hardware_sync_machine.name,
         # Bump timeout to 40m since VMs are slower
         timeout=40 * 60,
     )
@@ -182,6 +183,7 @@ def test_hardware_sync(
                 hardware_sync_machine.machine,
                 status="Ready",
                 abort_status="Releasing failed",
+                machine_id=hardware_sync_machine.name,
                 timeout=40 * 60,
             )
             for device_config in hardware_sync_machine.devices_config:
@@ -210,6 +212,7 @@ def test_hardware_sync(
                 hardware_sync_machine.machine,
                 status="Deployed",
                 abort_status="Failed deployment",
+                machine_id=hardware_sync_machine.name,
                 timeout=40 * 60,
             )
 
diff --git a/systemtests/tests_per_machine/test_machine.py b/systemtests/tests_per_machine/test_machine.py
index 8cdc653..4267ba7 100644
--- a/systemtests/tests_per_machine/test_machine.py
+++ b/systemtests/tests_per_machine/test_machine.py
@@ -54,7 +54,7 @@ def test_full_circle(
 
     mac_address = machine_config.mac_address
 
-    machine = wait_for_new_machine(maas_api_client, mac_address)
+    machine = wait_for_new_machine(maas_api_client, mac_address, machine_config.name)
 
     if not machine["power_type"]:
         machine = maas_api_client.update_machine(
@@ -88,6 +88,7 @@ def test_full_circle(
         machine,
         status="Ready",
         abort_status="Failed commissioning",
+        machine_id=machine_config.name,
         timeout=timeout,
     )
     yield
@@ -101,6 +102,7 @@ def test_full_circle(
         machine,
         status="Deployed",
         abort_status="Failed deployment",
+        machine_id=machine_config.name,
         timeout=timeout,
     )
 
@@ -144,6 +146,7 @@ def test_full_circle(
         machine,
         status="Ready",
         abort_status="Releasing failed",
+        machine_id=machine_config.name,
         timeout=timeout,
     )
     yield
diff --git a/systemtests/utils.py b/systemtests/utils.py
index 98456d2..74917c6 100644
--- a/systemtests/utils.py
+++ b/systemtests/utils.py
@@ -154,10 +154,13 @@ def wait_for_machine(
     machine: api.Machine,
     status: str,
     abort_status: Optional[str] = None,
+    machine_id: Optional[str] = None,
     timeout: float = 10 * 60,
     delay: float = 30,
 ) -> api.Machine:
     """Blocks execution until machine reaches given status."""
+    if machine_id is None:
+        machine_id = machine["hostname"]
     quiet_client = api.QuietAuthenticatedAPIClient.from_api_client(api_client)
     for retry_info in retries(timeout, delay):
         tmp_machine = quiet_client.read_machine(machine)
@@ -176,14 +179,12 @@ def wait_for_machine(
         + (f": {event['description']}" if event["description"] else "")
         for event in reversed(events["events"])
     )
-    raise UnexpectedMachineStatus(
-        machine["hostname"], status, retry_info.elapsed, debug_outputs
-    )
+    raise UnexpectedMachineStatus(machine_id, status, retry_info.elapsed, debug_outputs)
 
 
 # XXX: Move to api.py
 def wait_for_new_machine(
-    api_client: api.AuthenticatedAPIClient, mac_address: str
+    api_client: api.AuthenticatedAPIClient, mac_address: str, machine_name: str
 ) -> api.Machine:
     """Blocks execution until a machine with the given mac_address appears as New."""
     quiet_client = api.QuietAuthenticatedAPIClient.from_api_client(api_client)
@@ -199,7 +200,9 @@ def wait_for_new_machine(
     if "lxd" in [m["power_type"] for m in machines]:
         debug_outputs.append(repr(api_client.lxd.list_instances()))
 
-    raise UnexpectedMachineStatus(mac_address, "New", retry_info.elapsed, debug_outputs)
+    raise UnexpectedMachineStatus(
+        machine_name, "New", retry_info.elapsed, debug_outputs
+    )
 
 
 def wait_for_machine_to_power_off(