From 74d2c8a5b425f6de6397a7c5b1e5dee6809a231b Mon Sep 17 00:00:00 2001
From: Benjamin Schimke <benjamin.schimke@canonical.com>
Date: Thu, 28 Nov 2024 17:08:36 +0100
Subject: [PATCH] apply comments

---
 tests/integration/tests/conftest.py               | 6 +++---
 tests/integration/tests/test_annotations.py       | 4 +---
 tests/integration/tests/test_strict_interfaces.py | 2 +-
 tests/integration/tests/test_util/tags.py         | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/integration/tests/conftest.py b/tests/integration/tests/conftest.py
index 12e9f51e3..3a484e0b0 100644
--- a/tests/integration/tests/conftest.py
+++ b/tests/integration/tests/conftest.py
@@ -7,7 +7,7 @@
 from typing import Generator, Iterator, List, Optional, Union
 
 import pytest
-from test_util import config, harness, util, tags
+from test_util import config, harness, tags, util
 from test_util.etcd import EtcdCluster
 from test_util.registry import Registry
 
@@ -30,8 +30,8 @@ def pytest_itemcollected(item):
         tag.args[0] in tags.TEST_LEVELS for tag in marked_tags
     ):
         pytest.fail(
-            f"The test {item.nodeid} does not have one of the test level tags ({", ".join(tags.TEST_LEVELS)})."
-            f"Please add at least one test-level tag using @pytest.mark.tags."
+            f"The test {item.nodeid} does not have one of the test level tags."
+            f"Please add at least one test-level tag using @pytest.mark.tags ({tags.TEST_LEVELS})."
         )
 
 
diff --git a/tests/integration/tests/test_annotations.py b/tests/integration/tests/test_annotations.py
index 30b2f734a..48c327c91 100644
--- a/tests/integration/tests/test_annotations.py
+++ b/tests/integration/tests/test_annotations.py
@@ -80,14 +80,13 @@ def test_skip_services_stop_on_remove(instances: List[harness.Instance]):
     services = joining_cp.exec(
         ["snap", "services", "k8s"], capture_output=True, text=True
     ).stdout.split("\n")[1:-1]
-    print(services)
     for service in services:
         if "k8s-apiserver-proxy" in service:
             assert (
                 " inactive " in service
             ), "apiserver proxy should be inactive on control-plane"
         else:
-            assert " active " in service, "service should be active"
+            assert " active " in service, f"'{service}' should be active"
 
     cluster_node.exec(["k8s", "remove-node", worker.id])
     nodes = util.ready_nodes(cluster_node)
@@ -95,7 +94,6 @@ def test_skip_services_stop_on_remove(instances: List[harness.Instance]):
     services = worker.exec(
         ["snap", "services", "k8s"], capture_output=True, text=True
     ).stdout.split("\n")[1:-1]
-    print(services)
     for service in services:
         for expected_active_service in [
             "containerd",
diff --git a/tests/integration/tests/test_strict_interfaces.py b/tests/integration/tests/test_strict_interfaces.py
index be081422f..3d6f77b33 100644
--- a/tests/integration/tests/test_strict_interfaces.py
+++ b/tests/integration/tests/test_strict_interfaces.py
@@ -15,7 +15,7 @@
 @pytest.mark.skipif(
     not config.STRICT_INTERFACE_CHANNELS, reason="No strict channels configured"
 )
-@pytest.mark.tags(tags.NIGHTLY)
+@pytest.mark.tags(tags.WEEKLY)
 def test_strict_interfaces(instances: List[harness.Instance], tmp_path):
     channels = config.STRICT_INTERFACE_CHANNELS
     cp = instances[0]
diff --git a/tests/integration/tests/test_util/tags.py b/tests/integration/tests/test_util/tags.py
index d477188fb..49f0204df 100644
--- a/tests/integration/tests/test_util/tags.py
+++ b/tests/integration/tests/test_util/tags.py
@@ -3,7 +3,6 @@
 #
 from pytest_tagging import combine_tags
 
-
 PULL_REQUEST = "pull_request"
 NIGHTLY = "nightly"
 WEEKLY = "weekly"