Refactor tests

* Use pytest-aiohttp
* Use the async def / await syntax.
* Fix tests to run with Python 3.8

tests/compute/dynamips/test_dynamips_manager.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2015 GNS3 Technologies Inc.
+# Copyright (C) 2020 GNS3 Technologies Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@ import tempfile
 import sys
 import uuid
 import os
-import asyncio
 
 from gns3server.compute.dynamips import Dynamips
 from gns3server.compute.dynamips.dynamips_error import DynamipsError
@@ -30,13 +29,15 @@ from tests.utils import asyncio_patch, AsyncioMagicMock
 
 
 @pytest.fixture
-def manager(port_manager):
+async def manager(loop, port_manager):
+
     m = Dynamips.instance()
     m.port_manager = port_manager
     return m
 
 
 def test_vm_invalid_dynamips_path(manager):
+
     with patch("gns3server.config.Config.get_section_config", return_value={"dynamips_path": "/bin/test_fake"}):
         with pytest.raises(DynamipsError):
             manager.find_dynamips()
@@ -51,6 +52,7 @@ def test_vm_non_executable_dynamips_path(manager):
 
 
 def test_get_dynamips_id(manager):
+
     project_1 = str(uuid.uuid4())
     project_2 = str(uuid.uuid4())
     project_3 = str(uuid.uuid4())
@@ -64,8 +66,8 @@ def test_get_dynamips_id(manager):
 
 
 def test_take_dynamips_id(manager):
-    project_1 = str(uuid.uuid4())
 
+    project_1 = str(uuid.uuid4())
     manager.take_dynamips_id(project_1, 1)
     assert manager.get_dynamips_id(project_1) == 2
     with pytest.raises(DynamipsError):
@@ -73,9 +75,9 @@ def test_take_dynamips_id(manager):
 
 
 def test_release_dynamips_id(manager):
+
     project_1 = str(uuid.uuid4())
     project_2 = str(uuid.uuid4())
-
     manager.take_dynamips_id(project_1, 1)
     manager.release_dynamips_id(project_1, 1)
     assert manager.get_dynamips_id(project_1) == 1
@@ -83,45 +85,43 @@ def test_release_dynamips_id(manager):
     manager.release_dynamips_id(project_2, 0)
 
 
-def test_project_closed(manager, project, async_run):
+async def test_project_closed(manager, compute_project):
 
-    manager._dynamips_ids[project.id] = set([1, 2, 3])
+    manager._dynamips_ids[compute_project.id] = set([1, 2, 3])
 
-    project_dir = project.module_working_path(manager.module_name.lower())
+    project_dir = compute_project.module_working_path(manager.module_name.lower())
     os.makedirs(project_dir)
     open(os.path.join(project_dir, "test.ghost"), "w+").close()
-
-    async_run(manager.project_closed(project))
-
+    await manager.project_closed(compute_project)
     assert not os.path.exists(os.path.join(project_dir, "test.ghost"))
-    assert project.id not in manager._dynamips_ids
+    assert compute_project.id not in manager._dynamips_ids
 
 
-def test_duplicate_node(manager, project, async_run):
+async def test_duplicate_node(manager, compute_project):
     """
     Duplicate dynamips do nothing it's manage outside the
     filesystem
     """
     with asyncio_patch('gns3server.compute.dynamips.nodes.c7200.C7200.create'):
-        source_node = async_run(manager.create_node(
+        source_node = await manager.create_node(
             'R1',
-            project.id,
+            compute_project.id,
             str(uuid.uuid4()),
             platform="c7200"
-        ))
-        destination_node = async_run(manager.create_node(
+        )
+        destination_node = await manager.create_node(
             'R2',
-            project.id,
+            compute_project.id,
             str(uuid.uuid4()),
             platform="c7200"
-        ))
+        )
         destination_node._hypervisor = AsyncioMagicMock()
 
         with open(os.path.join(source_node.working_dir, 'c3600_i1_nvram'), 'w+') as f:
             f.write("1")
         with open(source_node.startup_config_path, 'w+') as f:
             f.write('hostname R1\necho TEST')
-        async_run(manager.duplicate_node(source_node.id, destination_node.id))
+        await manager.duplicate_node(source_node.id, destination_node.id)
         assert not os.path.exists(os.path.join(destination_node.working_dir, 'c3600_i1_nvram'))
         with open(destination_node.startup_config_path) as f:
             content = f.read()

tests/compute/dynamips/test_dynamips_router.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2015 GNS3 Technologies Inc.
+# Copyright (C) 2020 GNS3 Technologies Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@ import os
 import uuid
 import pytest
 import asyncio
-import configparser
 
-from unittest.mock import patch
 from gns3server.compute.dynamips.nodes.router import Router
 from gns3server.compute.dynamips.dynamips_error import DynamipsError
 from gns3server.compute.dynamips import Dynamips
@@ -29,47 +27,51 @@ from gns3server.config import Config
 
 
 @pytest.fixture
-def manager(port_manager):
+async def manager(loop, port_manager):
+
     m = Dynamips.instance()
     m.port_manager = port_manager
     return m
 
 
 @pytest.fixture(scope="function")
-def router(project, manager):
-    return Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
+def router(compute_project, manager):
+
+    return Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager)
 
 
-def test_router(project, manager):
-    router = Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
+def test_router(compute_project, manager):
+
+    router = Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager)
     assert router.name == "test"
     assert router.id == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
 
-def test_convert_project_before_2_0_0_b3(project, manager):
+def test_convert_project_before_2_0_0_b3(compute_project, manager):
+
     node_id = str(uuid.uuid4())
-    wdir = project.module_working_directory(manager.module_name.lower())
+    wdir = compute_project.module_working_directory(manager.module_name.lower())
     os.makedirs(os.path.join(wdir, node_id))
     os.makedirs(os.path.join(wdir, "configs"))
     open(os.path.join(wdir, "configs", "i1_startup-config.cfg"), "w+").close()
     open(os.path.join(wdir, "configs", "i2_startup-config.cfg"), "w+").close()
     open(os.path.join(wdir, "c7200_i1_nvram"), "w+").close()
     open(os.path.join(wdir, "c7200_i2_nvram"), "w+").close()
-    router = Router("test", node_id, project, manager, dynamips_id=1)
+    router = Router("test", node_id, compute_project, manager, dynamips_id=1)
     assert os.path.exists(os.path.join(wdir, node_id, "configs", "i1_startup-config.cfg"))
     assert not os.path.exists(os.path.join(wdir, node_id, "configs", "i2_startup-config.cfg"))
     assert os.path.exists(os.path.join(wdir, node_id, "c7200_i1_nvram"))
     assert not os.path.exists(os.path.join(wdir, node_id, "c7200_i2_nvram"))
 
 
-def test_router_invalid_dynamips_path(project, manager, loop):
+async def test_router_invalid_dynamips_path(compute_project, manager):
 
     config = Config.instance()
     config.set("Dynamips", "dynamips_path", "/bin/test_fake")
     config.set("Dynamips", "allocate_aux_console_ports", False)
 
     with pytest.raises(DynamipsError):
-        router = Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0e", project, manager)
-        loop.run_until_complete(asyncio.ensure_future(router.create()))
+        router = Router("test", "00010203-0405-0607-0809-0a0b0c0d0e0e", compute_project, manager)
+        await router.create()
         assert router.name == "test"
         assert router.id == "00010203-0405-0607-0809-0a0b0c0d0e0e"

tests/compute/dynamips/test_ethernet_switch.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2017 GNS3 Technologies Inc.
+# Copyright (C) 2020 GNS3 Technologies Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from tests.utils import AsyncioMagicMock
-#from gns3server.compute.dynamips.nodes.ethernet_switch import EthernetSwitchConsole
 from gns3server.compute.nios.nio_udp import NIOUDP
 
 
-def test_mac_command(async_run):
+def test_mac_command():
+
     node = AsyncioMagicMock()
     node.name = "Test"
     node.nios = {}