NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-31 13:23:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests on @ehlers Docker init patch

Browse Source
This commit is contained in:
Julien Duponchelle 2016-03-04 09:08:40 +01:00
parent 1dd437ecdc
commit ee4b094160
No known key found for this signature in database
GPG Key ID: F1E2485547D4595D
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/modules/docker/test_docker_vm.py
View File

@ -98,7 +98,8 @@ def test_create(loop, project, manager):
"Hostname": "test", "Hostname": "test",
"Image": "ubuntu", "Image": "ubuntu",
"Env": [], "Env": [],
"Cmd": ["/bin/sh", "/gns3/init.sh", "/bin/sh"] "Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/sh"]
}) })
assert vm._cid == "e90e34656806" assert vm._cid == "e90e34656806"
@ -135,7 +136,8 @@ def test_create_vnc(loop, project, manager):
"Hostname": "test", "Hostname": "test",
"Image": "ubuntu", "Image": "ubuntu",
"Env": ['DISPLAY=:42'], "Env": ['DISPLAY=:42'],
"Cmd": ["/bin/sh", "/gns3/init.sh", "/bin/sh"] "Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/sh"]
}) })
assert vm._start_vnc.called assert vm._start_vnc.called
assert vm._cid == "e90e34656806" assert vm._cid == "e90e34656806"
@ -163,7 +165,8 @@ def test_create_start_cmd(loop, project, manager):
"Privileged": True "Privileged": True
}, },
"Volumes": {}, "Volumes": {},
"Cmd": ["/bin/sh", "/gns3/init.sh", "/bin/ls"], "Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/ls"],
"NetworkDisabled": True, "NetworkDisabled": True,
"Name": "test", "Name": "test",
"Hostname": "test", "Hostname": "test",
@ -200,7 +203,8 @@ def test_create_environment(loop, project, manager):
"Name": "test", "Name": "test",
"Hostname": "test", "Hostname": "test",
"Image": "ubuntu", "Image": "ubuntu",
"Cmd": ["/bin/sh", "/gns3/init.sh", "/bin/sh"] "Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/sh"]
}) })
assert vm._cid == "e90e34656806" assert vm._cid == "e90e34656806"
@ -246,7 +250,8 @@ def test_create_image_not_available(loop, project, manager):
"Hostname": "test", "Hostname": "test",
"Image": "ubuntu", "Image": "ubuntu",
"Env": [], "Env": [],
"Cmd": ["/bin/sh", "/gns3/init.sh", "/bin/sh"] "Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/sh"]
}) })
assert vm._cid == "e90e34656806" assert vm._cid == "e90e34656806"
mock_pull.assert_called_with("ubuntu") mock_pull.assert_called_with("ubuntu")
@ -456,7 +461,8 @@ def test_update(loop, vm):
"Hostname": "test", "Hostname": "test",
"Image": "ubuntu", "Image": "ubuntu",
"Env": [], "Env": [],
"Cmd": ["/bin/sh", "/gns3/init.sh", "/bin/sh"] "Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/sh"]
}) })
assert vm.console == original_console assert vm.console == original_console
@ -493,7 +499,8 @@ def test_update_running(loop, vm):
"Hostname": "test", "Hostname": "test",
"Image": "ubuntu", "Image": "ubuntu",
"Env": [], "Env": [],
"Cmd": ["/bin/sh", "/gns3/init.sh", "/bin/sh"] "Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/sh"]
}) })
assert vm.console == original_console assert vm.console == original_console