mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-13 20:08:55 +00:00
Merge remote-tracking branch 'origin/2.1' into 2.1
This commit is contained in:
commit
e8353e68bb
@ -1144,7 +1144,7 @@ class QemuVM(BaseNode):
|
||||
yield from self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
|
||||
self._local_udp_tunnels[adapter_number][1],
|
||||
nio)
|
||||
except IndexError:
|
||||
except (IndexError, KeyError):
|
||||
raise QemuError('Adapter {adapter_number} does not exist on QEMU VM "{name}"'.format(name=self._name,
|
||||
adapter_number=adapter_number))
|
||||
|
||||
|
@ -325,7 +325,7 @@ class Node:
|
||||
if self._node_type == "docker":
|
||||
timeout = None
|
||||
else:
|
||||
timeout = 120
|
||||
timeout = 1200
|
||||
trial = 0
|
||||
while trial != 6:
|
||||
try:
|
||||
|
@ -195,7 +195,7 @@ def test_create(node, compute, project, async_run):
|
||||
"startup_script": "echo test",
|
||||
"name": "demo"
|
||||
}
|
||||
compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=120)
|
||||
compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=1200)
|
||||
assert node._console == 2048
|
||||
assert node._properties == {"startup_script": "echo test"}
|
||||
|
||||
@ -244,7 +244,7 @@ def test_create_base_script(node, config, compute, tmpdir, async_run):
|
||||
"startup_script": "hostname test",
|
||||
"name": "demo"
|
||||
}
|
||||
compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=120)
|
||||
compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=1200)
|
||||
|
||||
|
||||
def test_symbol(node, symbols_dir):
|
||||
@ -445,7 +445,7 @@ def test_create_without_console(node, compute, project, async_run):
|
||||
"startup_script": "echo test",
|
||||
"name": "demo"
|
||||
}
|
||||
compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=120)
|
||||
compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=1200)
|
||||
assert node._console == 2048
|
||||
assert node._properties == {"test_value": "success", "startup_script": "echo test"}
|
||||
|
||||
|
@ -153,7 +153,7 @@ def test_add_node_local(async_run, controller):
|
||||
data={'node_id': node.id,
|
||||
'startup_script': 'test.cfg',
|
||||
'name': 'test'},
|
||||
timeout=120)
|
||||
timeout=1200)
|
||||
assert compute in project._project_created_on_compute
|
||||
controller.notification.emit.assert_any_call("node.created", node.__json__())
|
||||
|
||||
@ -181,7 +181,7 @@ def test_add_node_non_local(async_run, controller):
|
||||
data={'node_id': node.id,
|
||||
'startup_script': 'test.cfg',
|
||||
'name': 'test'},
|
||||
timeout=120)
|
||||
timeout=1200)
|
||||
assert compute in project._project_created_on_compute
|
||||
controller.notification.emit.assert_any_call("node.created", node.__json__())
|
||||
|
||||
@ -222,7 +222,7 @@ def test_add_node_from_appliance(async_run, controller):
|
||||
'name': 'Test-1',
|
||||
'a': 1,
|
||||
},
|
||||
timeout=120)
|
||||
timeout=1200)
|
||||
assert compute in project._project_created_on_compute
|
||||
controller.notification.emit.assert_any_call("node.created", node.__json__())
|
||||
|
||||
@ -233,7 +233,7 @@ def test_add_node_from_appliance(async_run, controller):
|
||||
'name': 'Test-2',
|
||||
'a': 1
|
||||
},
|
||||
timeout=120)
|
||||
timeout=1200)
|
||||
|
||||
|
||||
def test_delete_node(async_run, controller):
|
||||
|
Loading…
Reference in New Issue
Block a user