ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-17 23:08:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
This commit is contained in:
grossmj
2018-01-23 12:47:13 +07:00
parent e54ccc26b0 f7d82059d5
commit 28f8216590
304 changed files with 5513 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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