diff options
author | Brett Holman <brett.holman@canonical.com> | 2023-02-17 09:32:59 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-17 09:32:59 -0700 |
commit | cfba324df55f67b7d5b23fe933039ae988850477 (patch) | |
tree | f3333026784005e12a8600bc03a0671ed2fccdf1 | |
parent | f6a742f545a853d812228d612b5c2a22078ea493 (diff) | |
download | cloud-init-git-cfba324df55f67b7d5b23fe933039ae988850477.tar.gz |
test: Fix integration test deprecation message (#2023)
-rw-r--r-- | tests/integration_tests/cmd/test_schema.py | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/tests/integration_tests/cmd/test_schema.py b/tests/integration_tests/cmd/test_schema.py index 0d92f146..0930309b 100644 --- a/tests/integration_tests/cmd/test_schema.py +++ b/tests/integration_tests/cmd/test_schema.py @@ -20,9 +20,9 @@ class TestSchemaDeprecations: log = class_client.read_from_file("/var/log/cloud-init.log") verify_clean_log(log, ignore_deprecations=True) assert "WARNING]: Deprecated cloud-config provided:" in log - assert "apt_reboot_if_required: DEPRECATED" in log - assert "apt_update: DEPRECATED" in log - assert "apt_upgrade: DEPRECATED" in log + assert "apt_reboot_if_required: Default: ``false``. Deprecated " in log + assert "apt_update: Default: ``false``. Deprecated in version" in log + assert "apt_upgrade: Default: ``false``. Deprecated in version" in log def test_schema_deprecations(self, class_client: IntegrationInstance): """Test schema behavior with deprecated configs.""" @@ -37,9 +37,18 @@ class TestSchemaDeprecations: ), "`schema` cmd must return 0 even with deprecated configs" assert not result.stderr assert "Cloud config schema deprecations:" in result.stdout - assert "apt_update: DEPRECATED" in result.stdout - assert "apt_upgrade: DEPRECATED" in result.stdout - assert "apt_reboot_if_required: DEPRECATED" in result.stdout + assert ( + "apt_update: Default: ``false``. Deprecated in version" + in result.stdout + ) + assert ( + "apt_upgrade: Default: ``false``. Deprecated in version" + in result.stdout + ) + assert ( + "apt_reboot_if_required: Default: ``false``. Deprecated in version" + in result.stdout + ) annotated_result = class_client.execute( f"cloud-init schema --annotate --config-file {user_data_fn}" @@ -56,9 +65,9 @@ class TestSchemaDeprecations: apt_reboot_if_required: false\t\t# D3 # Deprecations: ------------- - # D1: DEPRECATED: Dropped after April 2027. Use ``package_update``. Default: ``false`` - # D2: DEPRECATED: Dropped after April 2027. Use ``package_upgrade``. Default: ``false`` - # D3: DEPRECATED: Dropped after April 2027. Use ``package_reboot_if_required``. Default: ``false`` + # D1: Default: ``false``. Deprecated in version 22.2. Use ``package_update`` instead. + # D2: Default: ``false``. Deprecated in version 22.2. Use ``package_upgrade`` instead. + # D3: Default: ``false``. Deprecated in version 22.2. Use ``package_reboot_if_required`` instead. Valid cloud-config: /root/user-data""" # noqa: E501 |