Fix tests

tests/api/test_vpcs.py

@@ -15,6 +15,7 @@
 # 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
 from tests.utils import asyncio_patch
 from unittest.mock import patch
 

tests/modules/vpcs/test_vpcs_device.py

@@ -36,27 +36,27 @@ def manager():
 
 @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", 42, manager, working_dir=str(tmpdir))
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
     assert vm.name == "test"
-    assert vm.id == 42
+    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):
     with pytest.raises(VPCSError):
-        vm = VPCSDevice("test", 42, manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
         assert vm.name == "test"
-        assert vm.id == 42
+        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):
     with pytest.raises(VPCSError):
-        vm = VPCSDevice("test", 42, manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
         assert vm.name == "test"
-        assert vm.id == 42
+        assert vm.uuid == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
 def test_start(tmpdir, loop, manager):
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
-        vm = VPCSDevice("test", 42, manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
         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()))
@@ -65,7 +65,7 @@ def test_start(tmpdir, loop, manager):
 def test_stop(tmpdir, loop, manager):
     process = MagicMock()
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
-        vm = VPCSDevice("test", 42, manager, working_dir=str(tmpdir))
+        vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
         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()))
@@ -75,25 +75,25 @@ def test_stop(tmpdir, loop, manager):
         process.terminate.assert_called_with()
 
 def test_add_nio_binding_udp(tmpdir, manager):
-    vm = VPCSDevice("test", 42, manager, working_dir=str(tmpdir))
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
     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", 42, manager, working_dir=str(tmpdir))
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
     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", 42, manager, working_dir=str(tmpdir))
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
     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", 42, manager, working_dir=str(tmpdir))
+    vm = VPCSDevice("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", manager, working_dir=str(tmpdir))
     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