Chore(): Fix test

canonical · Feb 6, 2025 · 150d1b2 · 150d1b2
1 parent 30e9ecd
commit 150d1b2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -123,7 +123,7 @@ async def django_app_fixture(
     )
     await model.integrate(app_name, postgresql_k8s.name)
     await model.wait_for_idle(
-        apps=[app_name, postgresql_k8s.name], status="active", timeout=300, raise_on_blocked=True
+        apps=[app_name, postgresql_k8s.name], status="active", timeout=300
     )
     return app
 
@@ -147,7 +147,7 @@ async def fastapi_app_fixture(
     app = await model.deploy(charm_file, resources=resources, application_name=app_name)
     await model.integrate(app_name, postgresql_k8s.name)
     await model.wait_for_idle(
-        apps=[app_name, postgresql_k8s.name], status="active", timeout=300, raise_on_blocked=True
+        apps=[app_name, postgresql_k8s.name], status="active", timeout=300
     )
     return app
 
@@ -171,7 +171,7 @@ async def go_app_fixture(
     app = await model.deploy(charm_file, resources=resources, application_name=app_name)
     await model.integrate(app_name, postgresql_k8s.name)
     await model.wait_for_idle(
-        apps=[app_name, postgresql_k8s.name], status="active", timeout=300, raise_on_blocked=True
+        apps=[app_name, postgresql_k8s.name], status="active", timeout=300
     )
     return app
 

diff --git a/tests/integration/integrations/conftest.py b/tests/integration/integrations/conftest.py
@@ -93,13 +93,14 @@ async def deploy_tempo_cluster(ops_test: OpsTest, get_unit_ips):
     tempo_worker_charm_url, worker_channel = "tempo-worker-k8s", "edge"
     tempo_coordinator_charm_url, coordinator_channel = "tempo-coordinator-k8s", "edge"
     await ops_test.model.deploy(
-        tempo_worker_charm_url, application_name=worker_app, channel=worker_channel, trust=True
+        tempo_worker_charm_url, application_name=worker_app, channel=worker_channel, trust=True, revision=43,
     )
     app = await ops_test.model.deploy(
         tempo_coordinator_charm_url,
         application_name=tempo_app,
         channel=coordinator_channel,
         trust=True,
+        revision=53
     )
     await ops_test.model.deploy("s3-integrator", channel="edge")
     await ops_test.model.integrate(tempo_app + ":s3", "s3-integrator" + ":s3-credentials")

diff --git a/tests/integration/integrations/test_tracing.py b/tests/integration/integrations/test_tracing.py
@@ -43,11 +43,10 @@ async def test_workload_tracing(
     assert: Tempo should have tracing info about the app.
     """
     try:
-        tempo_app = await request.getfixturevalue("tempo_app")
+        tempo_app = request.getfixturevalue("tempo_app")
     except Exception as e:
-        if "object Application can't be used in 'await' expression" not in e:
-            logger.info(f"Tempo is already deployed  {e}")
-            tempo_app = model.applications["tempo"]
+        logger.info(f"Tempo is already deployed  {e}")
+        tempo_app = model.applications["tempo"]
 
     tracing_app = request.getfixturevalue(tracing_app_fixture)