diff options
| author | James Falcon <james.falcon@canonical.com> | 2022-05-05 13:56:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 12:56:29 -0600 |
| commit | faaa055b7f723ef945e3b72a065f1ade8993867b (patch) | |
| tree | a9ad4e53210245db782221268af56aa9debbc1ca | |
| parent | b1f7d8978b54640024774a4fe486df97ae554ff2 (diff) | |
| download | cloud-init-git-faaa055b7f723ef945e3b72a065f1ade8993867b.tar.gz | |
testing: Fix LXD VM metadata test (#1430)
Jammy additions changed the non-jammy subplatform check in a way that
caused failure
| -rw-r--r-- | tests/integration_tests/modules/test_combined.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/integration_tests/modules/test_combined.py b/tests/integration_tests/modules/test_combined.py index 88d6c890..d6a717c0 100644 --- a/tests/integration_tests/modules/test_combined.py +++ b/tests/integration_tests/modules/test_combined.py @@ -288,28 +288,29 @@ class TestCombined: # 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 |