Remove charmstore from integration tests

Author: cderici

tests/bundle/invalid.yaml

@@ -1,6 +1,6 @@
 applications:
   myapp:
-    charm: cs:xenial/ubuntu-0
+    charm: ch:xenial/ubuntu
     num_units: 1
     to:
       - 0

tests/integration/bundle/bundle-resource-rev.yaml

@@ -1,7 +1,7 @@
 series: xenial
 applications:
   ghost:
-    charm: "cs:ghost-19"
+    charm: "ch:ghost"
     num_units: 1
     resources:
       ghost-stable: 11

tests/integration/test_application.py

@@ -97,7 +97,7 @@ async def test_status_is_not_unset(event_loop):
 @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')
+        app = await model.deploy('ch:juju-qa-test')
 
         def app_ready():
             if not app.units:
@@ -116,7 +116,7 @@ async def test_add_units(event_loop):
 
     async with base.CleanModel() as model:
         app = await model.deploy(
-            'cs:ubuntu-0',
+            'ubuntu',
             application_name='ubuntu',
             series='trusty',
             channel='stable',
@@ -128,17 +128,6 @@ async def test_add_units(event_loop):
             assert isinstance(unit, Unit)
 
 
-@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')
-        await model.block_until(lambda: (len(app.units) > 0 and
-                                         app.units[0].machine))
-        assert app.data['charm-url'] == 'cs:ubuntu-0'
-
-
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_deploy_charmhub_charm(event_loop):
@@ -199,27 +188,27 @@ async def test_upgrade_charm_switch_channel(event_loop):
 @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')
+        app = await model.deploy('ubuntu')
         await model.block_until(lambda: (len(app.units) > 0 and
                                          app.units[0].machine))
-        assert app.data['charm-url'] == 'cs:ubuntu-0'
+        assert app.data['charm-url'] == 'ubuntu'
         await app.upgrade_charm(revision=8)
-        assert app.data['charm-url'] == 'cs:ubuntu-8'
+        assert app.data['charm-url'] == 'ubuntu'
 
 
 @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')
+        app = await model.deploy('ubuntu')
         await model.block_until(lambda: (len(app.units) > 0 and
                                          app.units[0].machine))
-        assert app.data['charm-url'] == 'cs:ubuntu-0'
+        assert app.data['charm-url'] == 'ubuntu'
         with pytest.raises(errors.JujuError):
-            await app.upgrade_charm(switch='ubuntu-8')
-        await app.upgrade_charm(switch='cs:ubuntu-8')
-        assert app.data['charm-url'] == 'cs:ubuntu-8'
+            await app.upgrade_charm(switch='ubuntu')
+        await app.upgrade_charm(switch='ubuntu')
+        assert app.data['charm-url'] == 'ubuntu'
 
 
 @base.bootstrapped
@@ -257,40 +246,6 @@ async def test_upgrade_local_charm_resource(event_loop):
         assert ress['file-res']
 
 
-@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')
-        await model.wait_for_idle(status="active")
-        assert app.data['charm-url'].startswith('cs:ubuntu')
-        await app.upgrade_charm(channel='latest/stable', switch='ch:ubuntu-8')
-        await model.wait_for_idle(status="active")
-        assert app.data['charm-url'].startswith('ch:')
-
-
-@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')
-
-        await model.wait_for_idle(wait_for_units=1)
-        unit = app.units[0]
-        expected_message = 'I have no resource.'
-        assert unit.workload_status_message == expected_message
-
-        await app.upgrade_charm(revision=1)
-        await model.block_until(
-            lambda: unit.workload_status_message != 'I have no resource.',
-            timeout=60,
-        )
-        expected_message = 'My resource: I am the resource.'
-        assert app.units[0].workload_status_message == expected_message
-
-
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_trusted(event_loop):

tests/integration/test_expose.py

@@ -11,7 +11,7 @@
 async def test_expose_unexpose(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy(
-            "cs:~jameinel/ubuntu-lite-7",
+            "ubuntu",
         )
 
         if not app.supports_granular_expose_parameters():

tests/integration/test_machine.py

@@ -12,7 +12,7 @@
 async def test_status(event_loop):
     async with base.CleanModel() as model:
         await model.deploy(
-            'cs:ubuntu-0',
+            'ubuntu',
             application_name='ubuntu',
             series='trusty',
             channel='stable',

tests/integration/test_model.py

@@ -305,23 +305,6 @@ async def test_deploy_trusted_bundle(event_loop):
         assert trusted is True
 
 
-@base.bootstrapped
-@pytest.mark.asyncio
-async def test_deploy_channels_revs(event_loop):
-    pytest.skip('Revise to use local charms - shouldnt fail b/c of origin')
-    async with base.CleanModel() as model:
-        charm = 'cs:~johnsca/libjuju-test'
-        stable = await model.deploy(charm, 'a1')
-        edge = await model.deploy(charm, 'a2', channel='edge')
-        rev = await model.deploy(charm + '-2', 'a3')
-
-        assert [a.charm_url for a in (stable, edge, rev)] == [
-            'cs:~johnsca/libjuju-test-1',
-            'cs:~johnsca/libjuju-test-2',
-            'cs:~johnsca/libjuju-test-2',
-        ]
-
-
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_deploy_from_ch_with_series(event_loop):

tests/unit/test_bundle.py

@@ -412,7 +412,6 @@ async def test_run(self, event_loop):
                                                "series": "series",
                                                "channel": "channel"})
 
-
         charms_facade = mock.Mock()
         charms_facade.AddCharm = base.AsyncMock(return_value=None)