Skip tests that need Charmstore->CharmHub update for now

Author: cderici

tests/charm-with-storage/config.yaml

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

tests/charm-with-storage/dispatch

@@ -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/charm-with-storage/metadata.yaml

@@ -0,0 +1,10 @@
+name: test-charm-with-storage
+series: ["focal"]
+summary: "test charm"
+description: "test"
+maintainers: ["test"]
+
+storage:
+  pgdata:
+    type: filesystem
+    description: "test storage"

tests/integration/test_application.py

@@ -79,6 +79,7 @@ async def test_get_set_config(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_status_is_not_unset(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy(
@@ -93,6 +94,7 @@ async def test_status_is_not_unset(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_status(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:~juju-qa/blocked-0')
@@ -108,6 +110,7 @@ def app_ready():
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_add_units(event_loop):
     from juju.unit import Unit
 
@@ -127,6 +130,7 @@ async def test_add_units(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_deploy_charmstore_charm(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:ubuntu-0')
@@ -147,6 +151,7 @@ async def test_deploy_charmhub_charm(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_upgrade_charm(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:ubuntu-0')
@@ -160,6 +165,7 @@ async def test_upgrade_charm(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_upgrade_charm_channel(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:ubuntu-0')
@@ -217,6 +223,7 @@ async def test_upgrade_charm_switch_channel(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_upgrade_charm_revision(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:ubuntu-0')
@@ -229,6 +236,7 @@ async def test_upgrade_charm_revision(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_upgrade_charm_switch(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:ubuntu-0')
@@ -258,6 +266,7 @@ async def test_upgrade_local_charm(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_upgrade_switch_charmstore_to_charmhub(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:ubuntu', series='focal')
@@ -270,6 +279,7 @@ async def test_upgrade_switch_charmstore_to_charmhub(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_upgrade_charm_resource(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy('cs:~juju-qa/bionic/upgrade-charm-resource-test-0')

tests/integration/test_connection.py

@@ -55,6 +55,7 @@ async def test_monitor_catches_error(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_full_status(event_loop):
     async with base.CleanModel() as model:
         await model.deploy(

tests/integration/test_crossmodel.py

@@ -9,6 +9,7 @@
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_offer(event_loop):
     async with base.CleanModel() as model:
         await model.deploy(
@@ -30,6 +31,7 @@ async def test_offer(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_consume(event_loop):
     async with base.CleanModel() as model_1:
         await model_1.deploy(
@@ -60,6 +62,7 @@ async def test_consume(event_loop):
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_remove_saas(event_loop):
     async with base.CleanModel() as model_1:
         await model_1.deploy(

tests/integration/test_expose.py

@@ -7,6 +7,7 @@
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_expose_unexpose(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy(

tests/integration/test_machine.py

@@ -8,6 +8,7 @@
 
 @base.bootstrapped
 @pytest.mark.asyncio
+@pytest.mark.skip('Update charm')
 async def test_status(event_loop):
     async with base.CleanModel() as model:
         await model.deploy(

tests/integration/test_model.py

@@ -1000,6 +1000,7 @@ async def test_unit_annotations(event_loop):
 
     async with base.CleanModel() as model:
         app = await model.deploy('ubuntu', channel="stable")
+        await model.wait_for_idle()
         unit = app.units[0]
 
         annotations = await unit.get_annotations()