Merge branch 'canonical:main' into TELCO-820-Validate-if-container-is…

…-up-before-updating-ca-certs

tests/interface/test_ingress.py

@@ -13,10 +13,6 @@ def test_ingress_v1_interface(interface_tester: InterfaceTester):
 
 def test_ingress_v2_interface(interface_tester: InterfaceTester):
     interface_tester.configure(
-        # todo: remove branch/repo overrides when
-        #  https://github.com/canonical/charm-relation-interfaces/pull/85 lands
-        repo="https://github.com/canonical/charm-relation-interfaces",
-        branch="ingress-v2-json",
         interface_name="ingress",
         interface_version=2,
     )

tests/scenario/test_ipa.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 from typing import List, Tuple
 
-import pytest
 import yaml
 from scenario import Context, Relation, State
 
@@ -120,7 +119,5 @@ def test_traefik_remote_app_scaledown_from_2(traefik_ctx, traefik_container):
     _, dynamic = get_configs(traefik_ctx, state)
     assert len(get_servers(dynamic[0])) == 1
 
-    with pytest.raises(IndexError):
-        # FIXME: solved in scenario 5.3.1 @https://github.com/canonical/ops-scenario/pull/64
-        break_(traefik_ctx, state)
-        assert not dynamic[0].exists()
+    break_(traefik_ctx, state)
+    assert not dynamic[0].exists()

tox.ini

@@ -85,7 +85,7 @@ allowlist_externals = /usr/bin/env
 description = Scenario tests
 deps =
     pytest
-    ops-scenario >= 5.3
+    ops-scenario >= 5.3.1
     -r{toxinidir}/requirements.txt
 commands =
     pytest -v --tb native {[vars]tst_path}/scenario --log-cli-level=INFO -s {posargs}
@@ -94,7 +94,7 @@ commands =
 description = Run interface tests
 deps =
     pytest
-    ops-scenario>=5.3
+    ops-scenario>=5.3.1
     pytest-interface-tester > 0.3
     -r{toxinidir}/requirements.txt
 commands =