From 927e6b540d6a606fdf2df04bc545ae4bc789f19d Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 20 Jan 2015 09:58:58 +0100 Subject: [PATCH] Fix tests --- docs/api/examples/get_version.txt | 2 +- docs/api/examples/post_project.txt | 8 ++++---- docs/api/examples/post_version.txt | 2 +- tests/api/test_vpcs.py | 1 + tests/modules/vpcs/test_vpcs_device.py | 24 ++++++++++++------------ 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docs/api/examples/get_version.txt b/docs/api/examples/get_version.txt index 3e711fce..59bdb128 100644 --- a/docs/api/examples/get_version.txt +++ b/docs/api/examples/get_version.txt @@ -1,4 +1,4 @@ -curl -i -xGET 'http://localhost:8000/version' +curl -i -X GET 'http://localhost:8000/version' GET /version HTTP/1.1 diff --git a/docs/api/examples/post_project.txt b/docs/api/examples/post_project.txt index ab6d97fc..e68380af 100644 --- a/docs/api/examples/post_project.txt +++ b/docs/api/examples/post_project.txt @@ -1,8 +1,8 @@ -curl -i -xPOST 'http://localhost:8000/project' -d '{"location": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-253/test_create_project_with_dir0"}' +curl -i -X POST 'http://localhost:8000/project' -d '{"location": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-262/test_create_project_with_dir0"}' POST /project HTTP/1.1 { - "location": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-253/test_create_project_with_dir0" + "location": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-262/test_create_project_with_dir0" } @@ -15,6 +15,6 @@ SERVER: Python/3.4 aiohttp/0.13.1 X-ROUTE: /project { - "location": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-253/test_create_project_with_dir0", - "uuid": "a8984692-a820-45de-8d4d-fc006b29072a" + "location": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-262/test_create_project_with_dir0", + "uuid": "66821e79-aa05-4490-8c26-ffb7aeddc0d2" } diff --git a/docs/api/examples/post_version.txt b/docs/api/examples/post_version.txt index 90ab4d81..45ef1069 100644 --- a/docs/api/examples/post_version.txt +++ b/docs/api/examples/post_version.txt @@ -1,4 +1,4 @@ -curl -i -xPOST 'http://localhost:8000/version' -d '{"version": "1.3.dev1"}' +curl -i -X POST 'http://localhost:8000/version' -d '{"version": "1.3.dev1"}' POST /version HTTP/1.1 { diff --git a/tests/api/test_vpcs.py b/tests/api/test_vpcs.py index 12244d3f..a63a6f9a 100644 --- a/tests/api/test_vpcs.py +++ b/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 . +from tests.api.base import server, loop from tests.utils import asyncio_patch from unittest.mock import patch diff --git a/tests/modules/vpcs/test_vpcs_device.py b/tests/modules/vpcs/test_vpcs_device.py index 3d532f1a..1b32e2ca 100644 --- a/tests/modules/vpcs/test_vpcs_device.py +++ b/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