Merge ~txiao/charm-thruk-agent:pytest_fixture into charm-thruk-agent:master

[Tianqi Xiao]

Update pytest fixtures to fix LP#1983398

func-test: https://paste.ubuntu.com/p/KzvmMythqS/

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Eric Chen (eric-chen)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 35e2239ba87a020c0d463190d2b6ec0e898a66f6

diff --git a/metadata.yaml b/metadata.yaml
index 8d9a16c..efe1f2e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -6,7 +6,6 @@ description: |
 tags:
   - ops, monitoring
 series:
-  - trusty
   - xenial
   - bionic
 subordinate: true
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
index c536318..04ca92d 100644
--- a/tests/functional/conftest.py
+++ b/tests/functional/conftest.py
@@ -12,6 +12,7 @@ from juju.errors import JujuError
 from juju.model import Model
 
 import pytest
+import pytest_asyncio
 
 
 STAT_FILE = "python3 -c \"import json; import os; s=os.stat('%s'); print(json.dumps({'uid': s.st_uid, 'gid': s.st_gid, 'mode': oct(s.st_mode), 'size': s.st_size}))\""  # noqa: E501
@@ -28,7 +29,7 @@ def event_loop(request):
     asyncio.set_event_loop(None)
 
 
[e-mail](scope="module")
+@pytest_asyncio.fixture(scope="module")
 async def controller():
     """Connect to the current controller."""
     controller = Controller()
@@ -37,7 +38,7 @@ async def controller():
     await controller.disconnect()
 
 
[e-mail](scope="module")
+@pytest_asyncio.fixture(scope="module")
 async def model(controller):
     """Create a model that lives only for the duration of the test."""
     model_name = "functest-{}".format(uuid.uuid4())
@@ -51,7 +52,7 @@ async def model(controller):
         await asyncio.sleep(1)
 
 
[e-mail](scope="module")
+@pytest_asyncio.fixture(scope="module")
 async def current_model():
     """Return the current model, does not create or destroy it."""
     model = Model()
@@ -60,7 +61,7 @@ async def current_model():
     await model.disconnect()
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def get_app(model):
     """Return the application requested."""  # noqa:D202
 
@@ -73,7 +74,7 @@ async def get_app(model):
     return _get_app
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def get_unit(model):
     """Return the requested <app_name>/<unit_number> unit."""  # noqa:D202
 
@@ -87,7 +88,7 @@ async def get_unit(model):
     return _get_unit
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def get_entity(model, get_unit, get_app):
     """Return a unit or an application."""  # noqa:D202
 
@@ -103,7 +104,7 @@ async def get_entity(model, get_unit, get_app):
     return _get_entity
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def run_command(get_unit):
     """Run a command on a unit.
 
@@ -119,7 +120,7 @@ async def run_command(get_unit):
     return _run_command
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def file_stat(run_command):
     """Run stat on a file.
 
@@ -135,7 +136,7 @@ async def file_stat(run_command):
     return _file_stat
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def file_contents(run_command):
     """Return the contents of a file.
 
@@ -151,7 +152,7 @@ async def file_contents(run_command):
     return _file_contents
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def reconfigure_app(get_app, model):
     """Apply a different config to the requested app."""  # noqa:D202
 
@@ -168,7 +169,7 @@ async def reconfigure_app(get_app, model):
     return _reconfigure_app
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def create_group(run_command):
     """Create the UNIX group specified."""  # noqa:D202
 
diff --git a/tests/functional/test_deploy.py b/tests/functional/test_deploy.py
index 362b1ba..8642b0f 100644
--- a/tests/functional/test_deploy.py
+++ b/tests/functional/test_deploy.py
@@ -4,6 +4,7 @@
 import os
 
 import pytest
+import pytest_asyncio
 
 import requests
 
@@ -12,7 +13,6 @@ pytestmark = pytest.mark.asyncio
 CHARM_BUILD_DIR = os.getenv("CHARM_BUILD_DIR", "..").rstrip("/")
 
 SERIES = [
-    "trusty",
     "xenial",
     "bionic",
 ]
@@ -23,13 +23,13 @@ SERIES = [
 ############
 
 
[e-mail](scope="module", params=SERIES)
+@pytest_asyncio.fixture(scope="module", params=SERIES)
 def series(request):
     """Return ubuntu version (i.e. xenial) in use in the test."""
     return request.param
 
 
[e-mail](scope="module")
+@pytest_asyncio.fixture(scope="module")
 async def deploy_app(model, series):
     """Return application of the charm under test."""
     app_name = "thruk-agent-{}".format(series)
@@ -61,7 +61,7 @@ async def deploy_app(model, series):
     yield thruk_agent_app
 
 
[e-mail](scope="module")
+@pytest_asyncio.fixture(scope="module")
 async def unit(deploy_app):
     """Return the thruk_agent unit we've deployed."""
     return deploy_app.units[0]