NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
This commit is contained in:
grossmj committed 2018-08-07 21:06:42 +07:00
2 parents 1cc1ccd511 12e71a2917
commit 033f005bde
402 files changed
+11042 -10444
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/handlers/api/controller/test_node.py
+4 -4
View File
@@ -164,7 +164,7 @@ def test_start_node(http_controller, tmpdir, project, compute, node):
compute.post = AsyncioMagicMock()
response = http_controller.post("/projects/{}/nodes/{}/start".format(project.id, node.id), example=True)
assert response.status == 201
assert response.status == 200
assert response.json == node.__json__()
@@ -173,7 +173,7 @@ def test_stop_node(http_controller, tmpdir, project, compute, node):
compute.post = AsyncioMagicMock()
response = http_controller.post("/projects/{}/nodes/{}/stop".format(project.id, node.id), example=True)
assert response.status == 201
assert response.status == 200
assert response.json == node.__json__()
@@ -182,7 +182,7 @@ def test_suspend_node(http_controller, tmpdir, project, compute, node):
compute.post = AsyncioMagicMock()
response = http_controller.post("/projects/{}/nodes/{}/suspend".format(project.id, node.id), example=True)
assert response.status == 201
assert response.status == 200
assert response.json == node.__json__()
@@ -191,7 +191,7 @@ def test_reload_node(http_controller, tmpdir, project, compute, node):
compute.post = AsyncioMagicMock()
response = http_controller.post("/projects/{}/nodes/{}/reload".format(project.id, node.id), example=True)
assert response.status == 201
assert response.status == 200
assert response.json == node.__json__()