ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-19 12:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.1' into 2.1

Browse Source
This commit is contained in:
grossmj 2017-12-21 09:38:28 +01:00
commit e8353e68bb
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/qemu/qemu_vm.py
View File

@ -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))

2
gns3server/controller/node.py
View File

@ -325,7 +325,7 @@ class Node:
if self._node_type == "docker":
timeout = None
else:
timeout = 120
timeout = 1200
trial = 0
while trial != 6:
try:

6
tests/controller/test_node.py
View File

@ -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"}

8
tests/controller/test_project.py
View File

@ -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):