From b3d1413564f2d443513247c69b0e759371df2008 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Thu, 1 Aug 2024 20:55:53 -0600 Subject: [PATCH] fix: Integration tests (#5576) String output changed in 7703634ec0. Instance-id doesn't change on LXD / Focal. --- tests/integration_tests/test_instance_id.py | 3 ++- tests/integration_tests/test_kernel_command_line_match.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/integration_tests/test_instance_id.py b/tests/integration_tests/test_instance_id.py index ed94b6b61c7..dc2fbb0f00a 100644 --- a/tests/integration_tests/test_instance_id.py +++ b/tests/integration_tests/test_instance_id.py @@ -6,6 +6,7 @@ from cloudinit import subp from tests.integration_tests.instances import IntegrationInstance from tests.integration_tests.integration_settings import PLATFORM +from tests.integration_tests.releases import CURRENT_RELEASE, FOCAL _INSTANCE_ID = 0 @@ -26,7 +27,7 @@ def setup_meta_data(instance: LXDInstance): # class TestInstanceID: @pytest.mark.skipif( - PLATFORM not in ["lxd_container", "lxd_vm"], + PLATFORM not in ["lxd_container", "lxd_vm"] or CURRENT_RELEASE == FOCAL, reason="Uses lxd-specific behavior.", ) @pytest.mark.lxd_setup.with_args(setup_meta_data) diff --git a/tests/integration_tests/test_kernel_command_line_match.py b/tests/integration_tests/test_kernel_command_line_match.py index 2fce349d098..57abf513ecc 100644 --- a/tests/integration_tests/test_kernel_command_line_match.py +++ b/tests/integration_tests/test_kernel_command_line_match.py @@ -104,8 +104,8 @@ def test_lxd_datasource_kernel_override_nocloud_net( ) assert url_val in client.execute("cloud-init query subplatform").stdout assert ( - "Detected platform: DataSourceNoCloudNet [seed=None]" - "[dsmode=net]. Checking for active instance data" + "Detected platform: DataSourceNoCloudNet. Checking for active" + "instance data" ) in logs