tests(minimal): rsyslog not in minimal images expect warning (canonic…

…al#5811)

Adapt test_no_problems to use verify_clean_boot instead of
verify_clean_log.

Fix verify_clean_boot to retain platform-specific ignored tracebacks
before passing it into _verify_clean_boot.

tests/integration_tests/modules/test_combined.py

@@ -31,7 +31,6 @@
     get_inactive_modules,
     lxd_has_nocloud,
     verify_clean_boot,
-    verify_clean_log,
     verify_ordered_items_in_text,
 )
 
@@ -150,17 +149,16 @@ def test_deprecated_message(self, class_client: IntegrationInstance):
         # user-data. Pass 22.2 in against the client's version_boundary.
         if lifecycle.should_log_deprecation("22.2", version_boundary):
             deprecated_messages.append(boundary_message)
-            verify_clean_boot(
-                class_client, require_deprecations=deprecated_messages
-            )
         else:
             # Expect the distros deprecated call to be redacted.
             # jsonschema still emits deprecation log due to changed_version
             # instead of deprecated_version
-            verify_clean_boot(
-                class_client, require_deprecations=deprecated_messages
-            )
             assert f"[INFO]: {boundary_message}" in log
+        verify_clean_boot(
+            class_client,
+            require_deprecations=deprecated_messages,
+            ignore_warnings=True,
+        )
 
     def test_ntp_with_apt(self, class_client: IntegrationInstance):
         """LP #1628337.
@@ -213,10 +211,24 @@ def test_random_seed_data(self, class_client: IntegrationInstance):
 
     def test_rsyslog(self, class_client: IntegrationInstance):
         """Test rsyslog is configured correctly."""
-        client = class_client
-        assert "My test log" in client.read_from_file(
-            "/var/spool/rsyslog/cloudinit.log"
-        )
+        if class_client.execute("command -v rsyslogd").failed:
+            # Some minimal images may not have an installed rsyslog package
+            # Test user-data doesn't provide install_rsyslog: true so expect
+            # warnings when not installed.
+            verify_clean_boot(
+                class_client,
+                require_warnings=[
+                    "Failed to reload-or-try-restart rsyslog.service:"
+                    " Unit rsyslog.service not found."
+                ],
+                ignore_warnings=True,  # Ignore other expected warnings
+                ignore_deprecations=True,  # Ignore exepected deprecations
+            )
+            class_client.execute("cloud-init status --format=yaml")
+        else:
+            assert "My test log" in class_client.read_from_file(
+                "/var/spool/rsyslog/cloudinit.log"
+            )
 
     def test_runcmd(self, class_client: IntegrationInstance):
         """Test runcmd works as expected"""
@@ -247,9 +259,7 @@ def test_timezone(self, class_client: IntegrationInstance):
         assert timezone_output.strip() == "CET"
 
     def test_no_problems(self, class_client: IntegrationInstance):
-        """Test no errors, warnings, deprecations, tracebacks or
-        inactive modules.
-        """
+        """Test no errors, warnings, tracebacks or inactive modules."""
         client = class_client
         status_file = client.read_from_file("/run/cloud-init/status.json")
         status_json = json.loads(status_file)["v1"]
@@ -260,7 +270,16 @@ def test_no_problems(self, class_client: IntegrationInstance):
         assert result_json["errors"] == []
 
         log = client.read_from_file("/var/log/cloud-init.log")
-        verify_clean_log(log, ignore_deprecations=False)
+        require_warnings = []
+        if class_client.execute("command -v rsyslogd").failed:
+            require_warnings.append(
+                "Failed to reload-or-try-restart rsyslog.service:"
+                " Unit rsyslog.service not found."
+            )
+        # Set ignore_deprecations=True as test_deprecated_message covers this
+        verify_clean_boot(
+            client, ignore_deprecations=True, require_warnings=require_warnings
+        )
         requested_modules = {
             "apt_configure",
             "byobu",

tests/integration_tests/util.py

@@ -168,7 +168,11 @@ def append_or_create_list(
             ignore_warnings,
             "Unable to disable SSH logins for opc given ssh_redirect_user",
         )
-
+    # Preserve platform-specific tracebacks expected
+    if isinstance(ignore_tracebacks, list):
+        ignore_tracebacks.extend(traceback_texts)
+    elif ignore_tracebacks is None:
+        ignore_tracebacks = traceback_texts
     _verify_clean_boot(
         instance,
         ignore_deprecations=ignore_deprecations,