Fixes in integration tests.

Author: Juan Tirado

.github/workflows/test.yaml

@@ -19,8 +19,10 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
+    - name: Install dependencies
+      run: pip install tox
     - name: Run unit tests
-      run: tox -e py3
+      run: tox -e py3,serial
 
 
   integration:
@@ -40,13 +42,11 @@ jobs:
       with:
         provider: lxd
         juju-channel: 3.0/stable
-        #channel: 1.25-strict/stable
-        #microk8s-group: snap_microk8s
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
     - name: Install dependencies
       run: pip install tox
     - name: Run integration
-      run: tox -e py3 -e integration,serial
+      run: tox -e integration

tests/bundle/mini-bundle.yaml

@@ -1,11 +1,11 @@
 applications:
   ghost:
-    charm: "ghost"
+    charm: "hello-juju"
     channel: stable
     num_units: 1
   mysql:
-    charm: "mysql"
+    charm: "postgresql"
     channel: candidate
     num_units: 1
 relations:
-  - ["ghost", "mysql"]
+  - ["hello-juju", "postgresql"]

tests/integration/bundle/bundle-include-base64.yaml

@@ -1,16 +1,32 @@
-series: xenial
+# series: xenial
+# applications:
+#   ghost:
+#     charm: "ghost"
+#     num_units: 1
+#   mysql:
+#     charm: "mysql"
+#     channel: candidate
+#     num_units: 1
+#     options:
+#       max-connections: 2
+#       tuning-level: include-base64://config-base64.yaml
+#   test:
+#     charm: "../charm"
+# relations:
+#   - ["ghost", "mysql"]
+
 applications:
-  ghost:
-    charm: "ghost"
-    num_units: 1
-  mysql:
-    charm: "mysql"
-    channel: candidate
+  helloa:
+    charm: "hello-juju"
+    name: "helloa"
+    channel: stable
     num_units: 1
     options:
-      max-connections: 2
-      tuning-level: include-base64://config-base64.yaml
+      application-repo: include-base64://config-base64.yaml
+  hellob:
+    charm: "hello-juju"
+    name: "hellob"
+    channel: stable
+    num_units: 1
   test:
-    charm: "../charm"
-relations:
-  - ["ghost", "mysql"]
+    charm: "../charm"

tests/integration/bundle/bundle-include-file.yaml

@@ -1,15 +1,15 @@
 applications:
-  ghost:
-    charm: "ghost"
+  helloa:
+    charm: "hello-juju"
+    name: "helloa"
     channel: stable
     num_units: 1
     options:
       config: include-file://config1.yaml
-  mysql:
-    charm: "mysql"
-    channel: candidate
+  hellob:
+    charm: "hello-juju"
+    name: "hellob"
+    channel: stable
     num_units: 1
   test:
     charm: "../charm"
-relations:
-  - ["ghost", "mysql"]

tests/integration/bundle/config-base64.yaml

@@ -1 +1 @@
-ZmFzdA==
+aHR0cDovL215LWp1anUuY29t

tests/integration/bundle/config1.yaml

@@ -1,3 +1,3 @@
-ghost:
-  url: "http://my-ghost.blg"
-  port: 2369
+helloa:
+  application-repo: "http://my-juju.com"
+  port: 666

tests/integration/file-resource-charm/metadata.yaml

@@ -1,5 +1,5 @@
 name: file-resource-charm
-series: ["focal"]
+series: ["jammy"]
 summary: "test local file resource"
 description: "charm for test deploy local file resource"
 maintainers: ["test"]

tests/integration/test_connection.py

@@ -59,9 +59,9 @@ async def test_monitor_catches_error(event_loop):
 async def test_full_status(event_loop):
     async with base.CleanModel() as model:
         await model.deploy(
-            'cs:ubuntu-0',
+            'ubuntu',
             application_name='ubuntu',
-            series='trusty',
+            series='focal',
             channel='stable',
         )
 

tests/integration/test_crossmodel.py

@@ -13,7 +13,7 @@
 async def test_offer(event_loop):
     async with base.CleanModel() as model:
         await model.deploy(
-            'cs:~jameinel/ubuntu-lite-7',
+            'ubuntu',
             application_name='ubuntu',
             series='focal',
             channel='stable',
@@ -35,7 +35,7 @@ async def test_offer(event_loop):
 async def test_consume(event_loop):
     async with base.CleanModel() as model_1:
         await model_1.deploy(
-            'cs:~jameinel/ubuntu-lite-7',
+            'ubuntu',
             application_name='ubuntu',
             series='focal',
             channel='stable',
@@ -66,7 +66,7 @@ async def test_consume(event_loop):
 async def test_remove_saas(event_loop):
     async with base.CleanModel() as model_1:
         await model_1.deploy(
-            'cs:~jameinel/ubuntu-lite-7',
+            'ubuntu',
             application_name='ubuntu',
             series='focal',
             channel='stable',
@@ -97,48 +97,48 @@ async def test_remove_saas(event_loop):
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_relate_with_offer(event_loop):
-    pytest.skip('Revise: intermittent problem with the remove_saas call')
+    # pytest.skip('Revise: intermittent problem with the remove_saas call')
     async with base.CleanModel() as model_1:
         application = await model_1.deploy(
-            'ch:mysql',
-            application_name='mysql',
-            series='xenial',
+            'postgresql',
+            application_name='postgresql',
+            series='focal',
             channel='stable',
         )
-        assert 'mysql' in model_1.applications
+        assert 'postgresql' in model_1.applications
         await model_1.wait_for_idle(status="active")
-        await model_1.create_offer("mysql:db")
+        await model_1.create_offer("postgresql:db")
 
         offers = await model_1.list_offers()
         await model_1.block_until(
-            lambda: all(offer.application_name == 'mysql'
+            lambda: all(offer.application_name == 'postgresql'
                         for offer in offers.results))
 
         # farm off a new model to test the consumption
         async with base.CleanModel() as model_2:
             await model_2.deploy(
-                'ch:mediawiki',
-                application_name='mediawiki',
-                series='trusty',
+                'hello-juju',
+                application_name='hello-juju',
+                series='focal',
                 channel='stable',
             )
             await model_2.block_until(
                 lambda: all(unit.agent_status == 'idle'
                             for unit in application.units))
 
-            await model_2.relate("mediawiki:db", "admin/{}.mysql".format(model_1.name))
+            await model_2.relate("hello-juju:db", "admin/{}.postgresql".format(model_1.name))
             status = await model_2.get_status()
-            if 'mysql' not in status.remote_applications:
+            if 'postgresql' not in status.remote_applications:
                 raise Exception("Expected mysql in saas")
 
-            await model_2.remove_saas('mysql')
+            await model_2.remove_saas('postgresql')
             await jasyncio.sleep(5)
 
             status = await model_2.get_status()
-            if 'mysql' in status.remote_applications:
+            if 'postgresql' in status.remote_applications:
                 raise Exception("Expected mysql not to be in saas")
 
-        await model_1.remove_offer("admin/{}.mysql".format(model_1.name), force=True)
+        await model_1.remove_offer("admin/{}.postgresql".format(model_1.name), force=True)
 
 
 @base.bootstrapped

tests/integration/test_macaroon_auth.py

@@ -18,9 +18,8 @@
 
 
 # this test must be run serially because it modifies the login password
-@pytest.mark.serial
 @base.bootstrapped
-@pytest.mark.asyncio
+@pytest.mark.serial
 @pytest.mark.skip('one of old macaroon_auth tests, needs to be revised')
 async def test_macaroon_auth_serial(event_loop):
     jujudata = FileJujuData()