Add functional tests for Model.add_machine()

[osm/N2VC.git] / tests / client / test_client.py

diff --git a/tests/client/test_client.py b/tests/client/test_client.py
index 8598878..653da5b 100644 (file)
--- a/tests/client/test_client.py
+++ b/tests/client/test_client.py
@@ -1,5 +1,4 @@
-import asyncio
-import unittest
+import pytest
 
 from juju.client.connection import Connection
 from juju.client import client
@@ -8,19 +7,18 @@ from ..base import bootstrapped
 
 
 @bootstrapped
-class UserManagerTest(unittest.TestCase):
-    def test_user_info(self):
-        loop = asyncio.get_event_loop()
-        conn = loop.run_until_complete(
-            Connection.connect_current())
-        conn = loop.run_until_complete(
-            conn.controller())
+@pytest.mark.asyncio
+async def test_user_info(event_loop):
+    conn = await Connection.connect_current()
+    controller_conn = await conn.controller()
 
-        um = client.UserManagerFacade()
-        um.connect(conn)
-        result = loop.run_until_complete(
-            um.UserInfo([client.Entity('user-admin')], True))
+    um = client.UserManagerFacade()
+    um.connect(controller_conn)
+    result = await um.UserInfo(
+        [client.Entity('user-admin')], True)
+    await conn.close()
+    await controller_conn.close()
 
-        self.assertIsInstance(result, client.UserInfoResults)
-        for r in result.results:
-            self.assertIsInstance(r, client.UserInfoResult)
+    assert isinstance(result, client.UserInfoResults)
+    for r in result.results:
+        assert isinstance(r, client.UserInfoResult)