remove legacy marks

Author: imanenami

tests/integration/ha/test_ha.py

@@ -51,8 +51,6 @@
 BROKER_PORT = SECURITY_PROTOCOL_PORTS["SASL_PLAINTEXT", "SCRAM-SHA-512"].client
 
 
-@pytest.mark.skip_if_deployed
-@pytest.mark.abort_on_fail
 def test_build_and_deploy(juju: jubilant.Juju, kafka_charm, app_charm, kraft_mode, kafka_apps):
     deploy_cluster(
         juju=juju,

tests/integration/ha/test_ha_controller.py

@@ -51,8 +51,6 @@ def raise_if_not_kraft_multi(kraft_mode: KRaftMode):
         raise Exception("Controller HA tests should only run with --kraft-mode=multi")
 
 
-@pytest.mark.skip_if_deployed
-@pytest.mark.abort_on_fail
 def test_deploy_active(juju: jubilant.Juju, kafka_charm, app_charm, kafka_apps):
     deploy_cluster(
         juju=juju,
@@ -249,7 +247,6 @@ def test_full_cluster_restart(
     assert_quorum_lag_is_zero(juju=juju)
 
 
-@pytest.mark.abort_on_fail
 def test_network_cut_without_ip_change(
     juju: jubilant.Juju,
     c_writes: ContinuousWrites,

tests/integration/test_auto_balance.py

@@ -2,7 +2,6 @@
 import time
 
 import jubilant
-import pytest
 
 from integration.ha.continuous_writes import ContinuousWrites
 from integration.helpers import (
@@ -46,8 +45,6 @@ def _assert_partitions_rebalanced(model: str, num_brokers: int, timeout: int = 1
     raise TimeoutError(f"Partition rebalance assertion failed after {timeout} seconds")
 
 
-@pytest.mark.skip_if_deployed
-@pytest.mark.abort_on_fail
 def test_build_and_deploy(
     juju: jubilant.Juju,
     kafka_charm,

tests/integration/test_balancer.py

@@ -41,8 +41,6 @@ class TestBalancer:
     deployment_strat: str = os.environ.get("DEPLOYMENT", "multi")
     balancer_app: str = {"single": APP_NAME, "multi": CONTROLLER_NAME}[deployment_strat]
 
-    @pytest.mark.abort_on_fail
-    @pytest.mark.skip_if_deployed
     def test_build_and_deploy(self, juju: jubilant.Juju, kafka_charm):
 
         juju.deploy(
@@ -100,7 +98,6 @@ def test_build_and_deploy(self, juju: jubilant.Juju, kafka_charm):
         assert status.apps[CONTROLLER_NAME].app_status.current == "blocked"
         assert status.apps[self.balancer_app].app_status.current == "blocked"
 
-    @pytest.mark.abort_on_fail
     def test_relate_not_enough_brokers(self, juju: jubilant.Juju):
         juju.integrate(
             f"{APP_NAME}:{PEER_CLUSTER_ORCHESTRATOR_RELATION}",
@@ -124,7 +121,6 @@ def test_relate_not_enough_brokers(self, juju: jubilant.Juju):
         with pytest.raises(CalledProcessError):
             assert balancer_is_running(model_full_name=juju.model, app_name=self.balancer_app)
 
-    @pytest.mark.abort_on_fail
     def test_minimum_brokers_balancer_starts(self, juju: jubilant.Juju):
         juju.add_unit(APP_NAME, num_units=2)
         time.sleep(60)
@@ -141,15 +137,12 @@ def test_minimum_brokers_balancer_starts(self, juju: jubilant.Juju):
         assert balancer_is_running(model_full_name=juju.model, app_name=self.balancer_app)
         assert balancer_is_secure(juju, app_name=self.balancer_app)
 
-    @pytest.mark.abort_on_fail
     def test_balancer_exporter_endpoints(self, juju: jubilant.Juju):
         assert balancer_exporter_is_up(juju.model, self.balancer_app)
 
-    @pytest.mark.abort_on_fail
     def test_balancer_monitor_state(self, juju: jubilant.Juju):
         assert balancer_is_ready(juju=juju, app_name=self.balancer_app)
 
-    @pytest.mark.abort_on_fail
     @pytest.mark.skipif(
         deployment_strat == "single", reason="Testing full rebalance on large deployment"
     )
@@ -185,7 +178,6 @@ def test_add_unit_full_rebalance(self, juju: jubilant.Juju):
             get_replica_count_by_broker_id(juju, self.balancer_app).get(str(new_broker_id), 0)
         )  # replicas were successfully moved
 
-    @pytest.mark.abort_on_fail
     @pytest.mark.skipif(
         deployment_strat == "multi", reason="Testing full rebalance on single-app deployment"
     )
@@ -226,7 +218,6 @@ def test_add_unit_targeted_rebalance(self, juju: jubilant.Juju):
             get_replica_count_by_broker_id(juju, self.balancer_app).get(str(new_broker_id), 0)
         )  # replicas were successfully moved
 
-    @pytest.mark.abort_on_fail
     @pytest.mark.skipif(
         deployment_strat == "multi", reason="Testing full rebalance on single-app deployment"
     )
@@ -270,7 +261,6 @@ def test_balancer_prepare_unit_removal(self, juju: jubilant.Juju):
             get_replica_count_by_broker_id(juju, self.balancer_app).get(str(new_broker_id), 0)
         )
 
-    @pytest.mark.abort_on_fail
     def test_tls(self, juju: jubilant.Juju):
         # deploy and integrate tls
         tls_config = {"ca-common-name": "kafka"}

tests/integration/test_charm.py

@@ -40,8 +40,6 @@
 pytestmark = pytest.mark.broker
 
 
-@pytest.mark.abort_on_fail
-@pytest.mark.skip_if_deployed
 def test_build_and_deploy(juju: jubilant.Juju, kafka_charm, kraft_mode, controller_app):
     juju.cli("create-storage-pool", "test_pool", "lxd")
 
@@ -60,14 +58,12 @@ def test_build_and_deploy(juju: jubilant.Juju, kafka_charm, kraft_mode, controll
     )
 
 
-@pytest.mark.abort_on_fail
 def test_consistency_between_workload_and_metadata(juju: jubilant.Juju):
     with open("refresh_versions.toml", "r") as f:
         data = toml.load(f)
     assert juju.status().apps[APP_NAME].version == data["workload"]
 
 
-@pytest.mark.abort_on_fail
 def test_remove_controller_relation_relate(juju: jubilant.Juju, kraft_mode, controller_app):
     if kraft_mode == "single":
         logger.info(f"Skipping because we're using {kraft_mode} mode.")
@@ -96,7 +92,6 @@ def test_remove_controller_relation_relate(juju: jubilant.Juju, kraft_mode, cont
     )
 
 
-@pytest.mark.abort_on_fail
 def test_listeners(juju: jubilant.Juju, app_charm, kafka_apps):
     address = get_address(juju=juju)
     assert check_socket(
@@ -145,7 +140,6 @@ def test_listeners(juju: jubilant.Juju, app_charm, kafka_apps):
     )
 
 
-@pytest.mark.abort_on_fail
 def test_client_properties_makes_admin_connection(juju: jubilant.Juju, kafka_apps, kraft_mode):
     juju.integrate(APP_NAME, f"{DUMMY_NAME}:{REL_NAME_ADMIN}")
 
@@ -178,7 +172,6 @@ def test_client_properties_makes_admin_connection(juju: jubilant.Juju, kafka_app
     )
 
 
-@pytest.mark.abort_on_fail
 def test_logs_write_to_storage(juju: jubilant.Juju, kafka_apps):
     juju.integrate(APP_NAME, f"{DUMMY_NAME}:{REL_NAME_ADMIN}")
     juju.wait(
@@ -216,15 +209,13 @@ def test_rack_awareness_integration(juju: jubilant.Juju):
     )
 
 
-@pytest.mark.abort_on_fail
 def test_exporter_endpoints(juju: jubilant.Juju):
     unit_address = get_address(juju=juju)
     jmx_exporter_url = f"http://{unit_address}:{JMX_EXPORTER_PORT}/metrics"
     jmx_resp = requests.get(jmx_exporter_url)
     assert jmx_resp.ok
 
 
-@pytest.mark.abort_on_fail
 def test_auxiliary_paths(juju: jubilant.Juju):
     for path in PATHS["kafka"]:
         result = subprocess.check_output(
@@ -240,7 +231,6 @@ def test_auxiliary_paths(juju: jubilant.Juju):
         assert int(match.group(1)) > 0
 
 
-@pytest.mark.abort_on_fail
 def test_log_level_change(juju: jubilant.Juju, kafka_apps):
     status = juju.status()
     for unit in status.apps[APP_NAME].units:
@@ -284,7 +274,6 @@ def test_log_level_change(juju: jubilant.Juju, kafka_apps):
     )
 
 
-@pytest.mark.abort_on_fail
 @pytest.mark.skip(reason="skipping as we can't add storage without losing Juju conn")
 def test_logs_write_to_new_storage(juju: jubilant.Juju):
     check_output(
@@ -303,7 +292,6 @@ def test_logs_write_to_new_storage(juju: jubilant.Juju):
     )
 
 
-@pytest.mark.abort_on_fail
 @pytest.mark.fails_in_kafka4
 @pytest.mark.skip(reason="storage format command fails in KRaft mode")
 def test_deploy_with_existing_storage(juju: jubilant.Juju, kafka_apps):

tests/integration/test_kraft.py

@@ -92,8 +92,6 @@ def _assert_quorum_healthy(self, juju: jubilant.Juju):
             else:
                 assert status == KRaftUnitStatus.OBSERVER
 
-    @pytest.mark.abort_on_fail
-    @pytest.mark.skip_if_deployed
     def test_build_and_deploy(self, juju: jubilant.Juju, kafka_charm, app_charm, kraft_mode):
 
         juju.deploy(
@@ -140,7 +138,6 @@ def test_build_and_deploy(self, juju: jubilant.Juju, kafka_charm, app_charm, kra
             timeout=1800,
         )
 
-    @pytest.mark.abort_on_fail
     def test_integrate(self, juju: jubilant.Juju, kafka_apps):
         if self.controller_app != APP_NAME:
             juju.integrate(
@@ -165,19 +162,16 @@ def test_integrate(self, juju: jubilant.Juju, kafka_apps):
             timeout=900,
         )
 
-    @pytest.mark.abort_on_fail
     def test_listeners(self, juju: jubilant.Juju):
         self._assert_listeners_accessible(juju)
 
-    @pytest.mark.abort_on_fail
     def test_authorizer(self, juju: jubilant.Juju):
 
         address = get_address(juju=juju)
         port = SECURITY_PROTOCOL_PORTS["SASL_SSL", "SCRAM-SHA-512"].internal
 
         create_test_topic(juju, f"{address}:{port}")
 
-    @pytest.mark.abort_on_fail
     def test_scale_out(self, juju: jubilant.Juju):
         juju.add_unit(self.controller_app, num_units=2)
 
@@ -213,7 +207,6 @@ def test_scale_out(self, juju: jubilant.Juju):
                 juju, broker_unit_num=unit_num, controller_unit_num=unit_num
             )
 
-    @pytest.mark.abort_on_fail
     @pytest.mark.skipif(tls_enabled, reason="Not required with TLS test.")
     def test_leader_change(self, juju: jubilant.Juju):
         juju.remove_unit(f"{self.controller_app}/0")
@@ -257,7 +250,6 @@ def test_leader_change(self, juju: jubilant.Juju):
         assert (offset + 3) in unit_status
         assert unit_status[offset + 3] == KRaftUnitStatus.FOLLOWER
 
-    @pytest.mark.abort_on_fail
     @pytest.mark.skipif(tls_enabled, reason="Not required with TLS test.")
     def test_scale_in(self, juju: jubilant.Juju):
         for unit_id in (1, 2):
@@ -286,7 +278,6 @@ def test_scale_in(self, juju: jubilant.Juju):
         )
 
     @pytest.mark.skipif(not tls_enabled, reason="only required when TLS is on.")
-    @pytest.mark.abort_on_fail
     def test_relate_peer_tls(self, juju: jubilant.Juju):
         # This test and the following one are inherently long due to double rolling restarts,
         # In order not to break on constrained CI, we decrease the produce rate of CW to 2/s.
@@ -332,7 +323,6 @@ def test_relate_peer_tls(self, juju: jubilant.Juju):
         assert_continuous_writes_consistency(results)
 
     @pytest.mark.skipif(not tls_enabled, reason="only required when TLS is on.")
-    @pytest.mark.abort_on_fail
     def test_remove_peer_tls_relation(self, juju: jubilant.Juju):
         c_writes = ContinuousWrites(model=juju.model, app=DUMMY_NAME, produce_rate=2)
         c_writes.start()

tests/integration/test_password_rotation.py

@@ -26,8 +26,6 @@
 REL_NAME_ADMIN = "kafka-client-admin"
 
 
-@pytest.mark.abort_on_fail
-@pytest.mark.skip_if_deployed
 def test_build_and_deploy(juju: jubilant.Juju, kraft_mode, kafka_charm, app_charm, kafka_apps):
     deploy_cluster(
         juju=juju,

tests/integration/test_provider.py

@@ -38,8 +38,6 @@
 NON_REL_USERS = set(INTERNAL_USERS + [CONTROLLER_USER])
 
 
-@pytest.mark.abort_on_fail
-@pytest.mark.skip_if_deployed
 def test_deploy_charms_relate_active(
     juju: jubilant.Juju, kraft_mode, kafka_charm, app_charm, kafka_apps, usernames: set[str]
 ):
@@ -79,7 +77,6 @@ def test_deploy_charms_relate_active(
             assert acl.resource_name == "test-prefix"
 
 
-@pytest.mark.abort_on_fail
 def test_deploy_multiple_charms_same_topic_relate_active(
     juju: jubilant.Juju, app_charm, kafka_apps, usernames: set[str]
 ):
@@ -109,7 +106,6 @@ def test_deploy_multiple_charms_same_topic_relate_active(
             assert acl.resource_name == "test-topic"
 
 
-@pytest.mark.abort_on_fail
 def test_remove_application_removes_user_and_acls(
     juju: jubilant.Juju, kafka_apps, usernames: set[str]
 ):
@@ -141,7 +137,6 @@ def test_remove_application_removes_user_and_acls(
             )
 
 
-@pytest.mark.abort_on_fail
 def test_deploy_producer_same_topic(
     juju: jubilant.Juju, app_charm, kafka_apps, usernames: set[str]
 ):
@@ -182,7 +177,6 @@ def test_deploy_producer_same_topic(
     )
 
 
-@pytest.mark.abort_on_fail
 def test_admin_added_to_super_users(juju: jubilant.Juju, app_charm, kafka_apps):
     """Test relation with admin privileges."""
     super_users = load_super_users(model_full_name=juju.model)
@@ -203,7 +197,6 @@ def test_admin_added_to_super_users(juju: jubilant.Juju, app_charm, kafka_apps):
     assert len(super_users) == 4
 
 
-@pytest.mark.abort_on_fail
 def test_admin_removed_from_super_users(juju: jubilant.Juju, kafka_apps):
     """Test that removal of the relation with admin privileges."""
     juju.remove_application(DUMMY_NAME_1)
@@ -224,7 +217,6 @@ def test_admin_removed_from_super_users(juju: jubilant.Juju, kafka_apps):
     time.sleep(30)
 
 
-@pytest.mark.abort_on_fail
 def test_prefixed_topic_creation(juju: jubilant.Juju, app_charm, kafka_apps):
     juju.deploy(
         app_charm,
@@ -246,7 +238,6 @@ def test_prefixed_topic_creation(juju: jubilant.Juju, app_charm, kafka_apps):
     assert response.results.get("success", None) == "TRUE"
 
 
-@pytest.mark.abort_on_fail
 def test_connection_updated_on_tls_enabled(juju: jubilant.Juju, app_charm, kafka_apps):
     """Test relation when TLS is enabled."""
     # adding new app unit to validate

tests/integration/test_provider_v1.py

@@ -128,8 +128,6 @@ def _assert_acl_integrity(juju: jubilant.Juju):
     )
 
 
-@pytest.mark.abort_on_fail
-@pytest.mark.skip_if_deployed
 def test_deploy_and_relate(
     juju: jubilant.Juju, kafka_charm, app_charm, kraft_mode, kafka_apps
 ) -> None:

tests/integration/test_refresh.py

@@ -26,7 +26,6 @@
 pytestmark = pytest.mark.broker
 
 
-@pytest.mark.abort_on_fail
 def test_in_place_upgrade(juju: jubilant.Juju, kafka_charm, app_charm, kraft_mode, controller_app):
     deploy_cluster(juju=juju, charm=kafka_charm, kraft_mode=kraft_mode, num_broker=3)
     juju.deploy(app_charm, app=DUMMY_NAME, num_units=1, base=BASE)
@@ -95,7 +94,6 @@ def test_in_place_upgrade(juju: jubilant.Juju, kafka_charm, app_charm, kraft_mod
     )
 
 
-@pytest.mark.abort_on_fail
 def test_controller_upgrade_multinode(
     juju: jubilant.Juju, kafka_charm, kraft_mode, controller_app
 ):