Upgrade tests WIP

Author: dragomirp

poetry.lock

@@ -72,7 +72,7 @@ psycopg2-binary = "^2.9.10"
 boto3 = "*"
 tenacity = "^9.1.2"
 allure-pytest = "^2.15.0"
-jubilant = "^1.4.0"
+jubilant = "^1.5.0"
 tomli-w = "^1.2.0"
 tomli = "^2.3.0"
 
@@ -101,6 +101,7 @@ minversion = "6.0"
 log_cli_level = "INFO"
 asyncio_mode = "auto"
 markers = ["juju3", "juju_secrets"]
+addopts = "--exitfirst"
 
 # Linting tools configuration
 [tool.ruff]

pyproject.toml

@@ -104,28 +104,15 @@ def juju(request: pytest.FixtureRequest):
 
     This adds command line parameter ``--keep-models`` (see help for details).
     """
-    controller = request.config.getoption("--controller")
     model = request.config.getoption("--model")
-    controller_and_model = None
-    if controller and model:
-        controller_and_model = f"{controller}:{model}"
-    elif controller:
-        controller_and_model = controller
-    elif model:
-        controller_and_model = model
     keep_models = bool(request.config.getoption("--keep-models"))
 
-    if controller_and_model:
-        juju = jubilant.Juju(model=controller_and_model)  # type: ignore
+    if model:
+        juju = jubilant.Juju(model=model)
         yield juju
-        log = juju.debug_log(limit=1000)
     else:
         with jubilant.temp_model(keep=keep_models) as juju:
             yield juju
-            log = juju.debug_log(limit=1000)
-
-    if request.session.testsfailed:
-        print(log, end="")
 
 
 @pytest.fixture(scope="module")