mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Fix test to support Python 3.7 Ref https://github.com/GNS3/gns3-gui/issues/2566
This commit is contained in:
1 parent
902de3dd47
commit
f5dc635baa
4 files changed
+32
-20
No files matched your search
@@ -150,9 +150,9 @@ def test_termination_callback(vm, async_run):
|
||||
async_run(vm._termination_callback(0))
|
||||
assert vm.status == "stopped"
|
||||
|
||||
async_run(queue.get(0)) # Ping
|
||||
async_run(queue.get(1)) # Ping
|
||||
|
||||
(action, event, kwargs) = async_run(queue.get(0))
|
||||
(action, event, kwargs) = async_run(queue.get(1))
|
||||
assert action == "node.updated"
|
||||
assert event == vm
|
||||
|
||||
@@ -170,7 +170,7 @@ def test_termination_callback_error(vm, tmpdir, async_run):
|
||||
async_run(vm._termination_callback(1))
|
||||
assert vm.status == "stopped"
|
||||
|
||||
async_run(queue.get(0)) # Ping
|
||||
async_run(queue.get(1)) # Ping
|
||||
|
||||
(action, event, kwargs) = queue.get_nowait()
|
||||
assert action == "node.updated"
|
||||
|
||||
@@ -66,7 +66,7 @@ def test_start(loop, vm, async_run):
|
||||
process.returncode = None
|
||||
|
||||
with NotificationManager.instance().queue() as queue:
|
||||
async_run(queue.get(0)) # Ping
|
||||
async_run(queue.get(1)) # Ping
|
||||
|
||||
vm.ip_address = "192.168.1.1"
|
||||
with patch("sys.platform", return_value="win"):
|
||||
@@ -88,7 +88,7 @@ def test_start(loop, vm, async_run):
|
||||
'192.168.1.2')
|
||||
assert vm.is_running()
|
||||
assert vm.command_line == ' '.join(mock_exec.call_args[0])
|
||||
(action, event, kwargs) = async_run(queue.get(0))
|
||||
(action, event, kwargs) = async_run(queue.get(1))
|
||||
assert action == "node.updated"
|
||||
assert event == vm
|
||||
|
||||
@@ -120,10 +120,10 @@ def test_stop(loop, vm, async_run):
|
||||
|
||||
process.terminate.assert_called_with()
|
||||
|
||||
async_run(queue.get(0)) # Ping
|
||||
async_run(queue.get(0)) # Started
|
||||
async_run(queue.get(1)) # Ping
|
||||
async_run(queue.get(1)) # Started
|
||||
|
||||
(action, event, kwargs) = async_run(queue.get(0))
|
||||
(action, event, kwargs) = async_run(queue.get(1))
|
||||
assert action == "node.updated"
|
||||
assert event == vm
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ def test_start(loop, vm, async_run):
|
||||
process.returncode = None
|
||||
|
||||
with NotificationManager.instance().queue() as queue:
|
||||
async_run(queue.get(0)) # Ping
|
||||
async_run(queue.get(1)) # Ping
|
||||
|
||||
with asyncio_patch("gns3server.compute.vpcs.vpcs_vm.VPCSVM._check_requirements", return_value=True):
|
||||
with asyncio_patch("asyncio.create_subprocess_exec", return_value=process) as mock_exec:
|
||||
@@ -113,7 +113,7 @@ def test_start(loop, vm, async_run):
|
||||
'127.0.0.1')
|
||||
assert vm.is_running()
|
||||
assert vm.command_line == ' '.join(mock_exec.call_args[0])
|
||||
(action, event, kwargs) = async_run(queue.get(0))
|
||||
(action, event, kwargs) = async_run(queue.get(1))
|
||||
assert action == "node.updated"
|
||||
assert event == vm
|
||||
|
||||
@@ -177,10 +177,10 @@ def test_stop(loop, vm, async_run):
|
||||
else:
|
||||
process.terminate.assert_called_with()
|
||||
|
||||
async_run(queue.get(0)) # Ping
|
||||
async_run(queue.get(0)) # Started
|
||||
async_run(queue.get(1)) # Ping
|
||||
async_run(queue.get(1)) # Started
|
||||
|
||||
(action, event, kwargs) = async_run(queue.get(0))
|
||||
(action, event, kwargs) = async_run(queue.get(1))
|
||||
assert action == "node.updated"
|
||||
assert event == vm
|
||||
|
||||
|
||||
Reference in new issue
Block a user