Revisiting tests.

Author: Juan Tirado

.github/workflows/test.yaml

@@ -16,13 +16,13 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
     - name: Install dependencies
       run: pip install tox
     - name: Run unit tests
-      run: tox -e py3,serial
+      run: tox -e py3
 
 
   integration:
@@ -43,7 +43,7 @@ jobs:
         provider: lxd
         juju-channel: 3.0/stable
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
     - name: Install dependencies

juju/jasyncio.py

@@ -83,6 +83,17 @@ def _task_result_exp_handler(task, task_name=task_name, logger=logger):
     task.add_done_callback(functools.partial(_task_result_exp_handler, task_name=task_name, logger=logger))
     return task
 
+class SingletonEventLoop(object):
+    """
+    Single instance containing an event loop to be reused.
+    """
+    loop = None
+    def __new__(cls):
+        if not hasattr(cls, 'instance'):
+          cls.instance = super(SingletonEventLoop, cls).__new__(cls)
+          cls.instance.loop = asyncio.new_event_loop()
+
+        return cls.instance
 
 def run(*steps):
     """
@@ -96,7 +107,8 @@ def run(*steps):
 
     task = None
     run._sigint = False  # function attr to allow setting from closure
-    loop = asyncio.new_event_loop()
+    # Use a singleton class to force a single event loop instance
+    loop = SingletonEventLoop().loop
 
     def abort():
         task.cancel()

tests/base.py

@@ -10,6 +10,18 @@
 from juju.client.jujudata import FileJujuData
 from juju.controller import Controller
 
+from juju.jasyncio import SingletonEventLoop
+
+@pytest.fixture(scope="session")
+def event_loop():
+    """
+    This fixture forces all the asyncio tests
+    to use the same events loop
+    """
+    loop = SingletonEventLoop().loop
+    yield loop
+    loop.close()
+
 
 def is_bootstrapped():
     try:

tests/integration/test_application.py

@@ -56,24 +56,24 @@ async def test_action(event_loop):
 @pytest.mark.asyncio
 async def test_get_set_config(event_loop):
     async with base.CleanModel() as model:
-        ubuntu_app = await model.deploy(
-            'percona-cluster',
-            application_name='mysql',
-            series='xenial',
+        app = await model.deploy(
+            'hello-juju',
+            application_name='hello-juju',
+            series='focal',
             channel='stable',
             config={
-                'tuning-level': 'safest',
+                'application-repo': 'http://my-juju.com',
             },
             constraints={
                 'arch': 'amd64',
                 'mem': 256 * MB,
             },
         )
 
-        config = await ubuntu_app.get_config()
-        await ubuntu_app.set_config(config)
+        config = await app.get_config()
+        await app.set_config(config)
 
-        config2 = await ubuntu_app.get_config()
+        config2 = await app.get_config()
         assert config == config2
 
 
@@ -83,9 +83,9 @@ async def test_get_set_config(event_loop):
 async def test_status_is_not_unset(event_loop):
     async with base.CleanModel() as model:
         app = await model.deploy(
-            'cs:ubuntu-0',
+            'ubuntu-0',
             application_name='ubuntu',
-            series='trusty',
+            series='jammy',
             channel='stable',
         )
 
@@ -143,10 +143,10 @@ async def test_deploy_charmstore_charm(event_loop):
 @pytest.mark.asyncio
 async def test_deploy_charmhub_charm(event_loop):
     async with base.CleanModel() as model:
-        app = await model.deploy('ch:hello-kubecon')
+        app = await model.deploy('hello-juju')
         await model.block_until(lambda: (len(app.units) > 0 and
                                          app.units[0].machine))
-        assert 'hello-kubecon' in app.data['charm-url']
+        assert 'hello-juju' in app.data['charm-url']
 
 
 @base.bootstrapped

tests/integration/test_machine.py

@@ -7,7 +7,7 @@
 
 
 @base.bootstrapped
-@pytest.mark.serial
+@pytest.mark.asyncio
 @pytest.mark.skip('Update charm')
 async def test_status(event_loop):
     async with base.CleanModel() as model:
@@ -38,7 +38,7 @@ async def test_status(event_loop):
 
 
 @base.bootstrapped
-@pytest.mark.serial
+@pytest.mark.asyncio
 async def test_scp(event_loop):
     # ensure that asyncio.subprocess will work;
     try: