Fix vault charm and cmr tests

Author: cderici

tests/integration/a.file

@@ -0,0 +1,4 @@
+options:
+  status:
+    type: string
+    default: "active"

tests/integration/charm-assumes/config.yaml

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+status="$(config-get status)"
+
+if [[ "$status" == "error" ]]; then
+    if [[ -e .errored ]]; then
+        status="active"
+    else
+        touch .errored
+        exit 1
+    fi
+fi
+status-set "$status"

tests/integration/charm-assumes/dispatch

@@ -0,0 +1,5 @@
+bases:
+  - architectures:
+      - amd64
+    channel: '22.04'
+    name: ubuntu

tests/integration/charm-assumes/manifest.yaml

@@ -0,0 +1,13 @@
+name: assumes-charm
+summary: "test"
+description: "test"
+maintainers: ["test"]
+assumes:
+  - juju
+  - any-of:
+      - all-of:
+          - juju >= 2.9
+          - juju < 3
+      - all-of:
+          - juju >= 3.1
+          - juju < 4

tests/integration/charm-assumes/metadata.yaml

@@ -205,7 +205,7 @@ async def test_secrets_backend_lifecycle(event_loop):
         # deploy postgresql
         await m.deploy('postgresql', base='ubuntu@22.04')
         # deploy vault
-        await m.deploy("vault", base='ubuntu@20.04')
+        await m.deploy("vault", channel='1.8/stable', base='ubuntu@22.04')
         # relate/integrate
         await m.integrate("vault:db", "postgresql:db")
         # wait for the postgresql app

tests/integration/test_controller.py

@@ -104,7 +104,7 @@ async def test_relate_with_offer(event_loop):
             channel='14/stable',
         )
         assert 'postgresql' in model_1.applications
-        await model_1.wait_for_idle(status="active")
+        await model_1.wait_for_idle()
         await model_1.create_offer("postgresql:db")
 
         offers = await model_1.list_offers()

tests/integration/test_crossmodel.py

@@ -1086,7 +1086,7 @@ async def test_application_annotations(event_loop):
 async def test_unit_annotations(event_loop):
 
     async with base.CleanModel() as model:
-        app = await model.deploy('ubuntu', channel="stable")
+        app = await model.deploy('ubuntu')
         await model.wait_for_idle()
         unit = app.units[0]
 
@@ -1096,8 +1096,8 @@ async def test_unit_annotations(event_loop):
         expected = {"foo": "bar", "another": "value"}
         await unit.set_annotations(expected)
 
-        annotations = await unit.get_annotations()
-        assert annotations == expected
+        annotations_2 = await unit.get_annotations()
+        assert annotations_2 == expected
 
 
 @base.bootstrapped