From e8ea455d68dadb7c07ae5c24a0d87955182826cf Mon Sep 17 00:00:00 2001 From: James Falcon Date: Wed, 4 May 2022 14:14:31 -0500 Subject: [PATCH] testing: Fix LXD VM metadata test Jammy additions changed the non-jammy subplatform check in a way that caused failure --- .../modules/test_combined.py | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/integration_tests/modules/test_combined.py b/tests/integration_tests/modules/test_combined.py index 88d6c890893..d6a717c03a5 100644 --- a/tests/integration_tests/modules/test_combined.py +++ b/tests/integration_tests/modules/test_combined.py @@ -288,28 +288,29 @@ def test_instance_json_lxd_vm(self, class_client: IntegrationInstance): # instance-id should be a UUID try: uuid.UUID(v1_data["instance_id"]) - except ValueError: + except ValueError as e: raise AssertionError( f"LXD instance-id is not a UUID: {v1_data['instance_id']}" - ) + ) from e + assert v1_data["subplatform"] == subplatform else: cloud_name = "unknown" - subplatform = "seed-dir (/var/lib/cloud/seed/nocloud-net)" # Pre-Jammy instance-id and instance.name are synonymous assert v1_data["instance_id"] == client.instance.name + assert any( + [ + "/var/lib/cloud/seed/nocloud-net" + in v1_data["subplatform"], + "/dev/sr0" in v1_data["subplatform"], + ] + ) assert v1_data["cloud_name"] == cloud_name - assert v1_data["subplatform"] == subplatform assert v1_data["platform"] == "lxd" assert v1_data["cloud_id"] == "lxd" assert f"{v1_data['cloud_id']}" == client.read_from_file( "/run/cloud-init/cloud-id-lxd" ) - assert any( - [ - "/var/lib/cloud/seed/nocloud-net" in v1_data["subplatform"], - "/dev/sr0" in v1_data["subplatform"], - ] - ) + assert v1_data["availability_zone"] is None assert v1_data["local_hostname"] == client.instance.name assert v1_data["region"] is None