Fix tests

tests/api/base.py

@@ -31,6 +31,7 @@ from gns3server.web.route import Route
 from gns3server.handlers import *
 from gns3server.modules import MODULES
 from gns3server.modules.port_manager import PortManager
+from gns3server.modules.project_manager import ProjectManager
 
 
 class Query:
@@ -162,3 +163,9 @@ def server(request, loop):
         srv.wait_closed()
     request.addfinalizer(tear_down)
     return Query(loop, host=host, port=port)
+
+
+@pytest.fixture(scope="module")
+def project():
+    return ProjectManager.instance().create_project(uuid = "a1e920ca-338a-4e9f-b363-aa607b09dd80")
+

tests/api/test_vpcs.py

@@ -15,24 +15,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from tests.api.base import server, loop
+import pytest
+from tests.api.base import server, loop, project
 from tests.utils import asyncio_patch
 from unittest.mock import patch
 
 
+@pytest.fixture(scope="module")
+def vm(server, project):
+    response = server.post("/vpcs", {"name": "PC TEST 1", "project_uuid": project.uuid})
+    assert response.status == 200
+    return response.json
+
+
 @asyncio_patch("gns3server.modules.VPCS.create_vm", return_value="61d61bdd-aa7d-4912-817f-65a9eb54d3ab")
-def test_vpcs_create(server):
-    response = server.post("/vpcs", {"name": "PC TEST 1"}, example=False)
+def test_vpcs_create(server, project):
+    response = server.post("/vpcs", {"name": "PC TEST 1", "project_uuid": project.uuid}, example=True)
     assert response.status == 200
     assert response.route == "/vpcs"
     assert response.json["name"] == "PC TEST 1"
     assert response.json["uuid"] == "61d61bdd-aa7d-4912-817f-65a9eb54d3ab"
+    assert response.json["project_uuid"] == "61d61bdd-aa7d-4912-817f-65a9eb54d3ab"
 
 
 #FIXME
-def test_vpcs_nio_create_udp(server):
-    vm = server.post("/vpcs", {"name": "PC TEST 1"})
-    response = server.post("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), {"type": "nio_udp",
+def test_vpcs_nio_create_udp(server, vm):
+    response = server.post("/vpcs/{}/ports/0/nio".format(vm["uuid"]), {"type": "nio_udp",
                                                                             "lport": 4242,
                                                                             "rport": 4343,
                                                                             "rhost": "127.0.0.1"},
@@ -43,9 +51,8 @@ def test_vpcs_nio_create_udp(server):
 
 
 @patch("gns3server.modules.vpcs.vpcs_device.has_privileged_access", return_value=True)
-def test_vpcs_nio_create_tap(mock, server):
-    vm = server.post("/vpcs", {"name": "PC TEST 1"})
-    response = server.post("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), {"type": "nio_tap",
+def test_vpcs_nio_create_tap(mock, server, vm):
+    response = server.post("/vpcs/{}/ports/0/nio".format(vm["uuid"]), {"type": "nio_tap",
                                                                             "tap_device": "test"})
     assert response.status == 200
     assert response.route == "/vpcs/{uuid}/ports/{port_id}/nio"
@@ -53,12 +60,11 @@ def test_vpcs_nio_create_tap(mock, server):
 
 
 #FIXME
-def test_vpcs_delete_nio(server):
-    vm = server.post("/vpcs", {"name": "PC TEST 1"})
-    response = server.post("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), {"type": "nio_udp",
+def test_vpcs_delete_nio(server, vm):
+    response = server.post("/vpcs/{}/ports/0/nio".format(vm["uuid"]), {"type": "nio_udp",
                                                                             "lport": 4242,
                                                                             "rport": 4343,
                                                                             "rhost": "127.0.0.1"})
-    response = server.delete("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), example=True)
+    response = server.delete("/vpcs/{}/ports/0/nio".format(vm["uuid"]), example=True)
     assert response.status == 200
     assert response.route == "/vpcs/{uuid}/ports/{port_id}/nio"

tests/modules/vpcs/test_vpcs_device.py

@@ -19,8 +19,8 @@ import pytest
 import asyncio
 from tests.utils import asyncio_patch
 
-#Move loop to util
-from tests.api.base import loop
+#TODO: Move loop to util
+from tests.api.base import loop, project
 from asyncio.subprocess import Process
 from unittest.mock import patch, MagicMock
 from gns3server.modules.vpcs.vpcs_device import VPCSDevice
@@ -28,44 +28,46 @@ from gns3server.modules.vpcs.vpcs_error import VPCSError
 from gns3server.modules.vpcs import VPCS
 from gns3server.modules.port_manager import PortManager
 
+
 @pytest.fixture(scope="module")
 def manager():
     m = VPCS.instance()
     m.port_manager = PortManager("127.0.0.1", False)
     return m
 
+
 @patch("subprocess.check_output", return_value="Welcome to Virtual PC Simulator, version 0.6".encode("utf-8"))
-def test_vm(tmpdir, manager):
-    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+def test_vm(manager):
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
     assert vm.name == "test"
     assert vm.uuid == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
 @patch("subprocess.check_output", return_value="Welcome to Virtual PC Simulator, version 0.1".encode("utf-8"))
-def test_vm_invalid_vpcs_version(tmpdir, manager):
+def test_vm_invalid_vpcs_version(project, manager):
     with pytest.raises(VPCSError):
-        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
         assert vm.name == "test"
         assert vm.uuid == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
 @patch("gns3server.config.Config.get_section_config", return_value = {"path": "/bin/test_fake"})
-def test_vm_invalid_vpcs_path(tmpdir, manager):
+def test_vm_invalid_vpcs_path(project, manager):
     with pytest.raises(VPCSError):
-        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
         assert vm.name == "test"
         assert vm.uuid == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
-def test_start(tmpdir, loop, manager):
+def test_start(project, loop, manager):
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
-        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
         nio = vm.port_add_nio_binding(0, {"type": "nio_udp", "lport": 4242, "rport": 4243, "rhost": "127.0.0.1"})
 
         loop.run_until_complete(asyncio.async(vm.start()))
         assert vm.is_running() == True
 
-def test_stop(tmpdir, loop, manager):
+def test_stop(project, loop, manager):
     process = MagicMock()
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
-        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
         nio = vm.port_add_nio_binding(0, {"type": "nio_udp", "lport": 4242, "rport": 4243, "rhost": "127.0.0.1"})
 
         loop.run_until_complete(asyncio.async(vm.start()))
@@ -74,26 +76,26 @@ def test_stop(tmpdir, loop, manager):
         assert vm.is_running() == False
         process.terminate.assert_called_with()
 
-def test_add_nio_binding_udp(tmpdir, manager):
-    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+def test_add_nio_binding_udp(manager):
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
     nio = vm.port_add_nio_binding(0, {"type": "nio_udp", "lport": 4242, "rport": 4243, "rhost": "127.0.0.1"})
     assert nio.lport == 4242
 
-def test_add_nio_binding_tap(tmpdir, manager):
-    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+def test_add_nio_binding_tap(project, manager):
+    vm = VPCSDevice("test", 42, project, manager)
     with patch("gns3server.modules.vpcs.vpcs_device.has_privileged_access", return_value=True):
         nio = vm.port_add_nio_binding(0, {"type": "nio_tap", "tap_device": "test"})
         assert nio.tap_device == "test"
 
-def test_add_nio_binding_tap_no_privileged_access(tmpdir, manager):
-    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+def test_add_nio_binding_tap_no_privileged_access(manager):
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
     with patch("gns3server.modules.vpcs.vpcs_device.has_privileged_access", return_value=False):
         with pytest.raises(VPCSError):
             vm.port_add_nio_binding(0, {"type": "nio_tap", "tap_device": "test"})
     assert vm._ethernet_adapter.ports[0] is None
 
-def test_port_remove_nio_binding(tmpdir, manager):
-    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
+def test_port_remove_nio_binding(manager):
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
     nio = vm.port_add_nio_binding(0, {"type": "nio_udp", "lport": 4242, "rport": 4243, "rhost": "127.0.0.1"})
     vm.port_remove_nio_binding(0)
     assert vm._ethernet_adapter.ports[0] is None