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 'master' into unstable

Browse Source
This commit is contained in:
Julien Duponchelle committed 2015-11-03 12:39:01 +01:00
2 parents a9d0951bb6 bd54c55ae1
commit 7967a922bc
6 files changed
+22 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/handlers/test_upload.py
+4 -4
View File
@@ -197,10 +197,10 @@ def test_backup_images(server, tmpdir, loop):
tar.close()
assert os.path.exists(os.path.join('QEMU', 'a.img'))
open(os.path.join('QEMU', 'a.img')).read() == 'hello'
assert open(os.path.join('QEMU', 'a.img')).read() == 'hello'
assert os.path.exists(os.path.join('QEMU', 'b.img'))
open(os.path.join('QEMU', 'b.img')).read() == 'world'
assert open(os.path.join('QEMU', 'b.img')).read() == 'world'
def test_backup_projects(server, tmpdir, loop):
@@ -229,7 +229,7 @@ def test_backup_projects(server, tmpdir, loop):
tar.close()
assert os.path.exists(os.path.join('a', 'a.gns3'))
open(os.path.join('a', 'a.gns3')).read() == 'hello'
assert open(os.path.join('a', 'a.gns3')).read() == 'hello'
assert os.path.exists(os.path.join('b', 'b.gns3'))
open(os.path.join('b', 'b.gns3')).read() == 'world'
assert open(os.path.join('b', 'b.gns3')).read() == 'world'
tests/modules/vpcs/test_vpcs_vm.py
-9
View File
@@ -181,15 +181,6 @@ def test_update_startup_script(vm):
assert f.read() == content
def test_update_startup_script(vm):
content = "echo GNS3 VPCS\nip 192.168.1.2\n"
vm.startup_script = content
filepath = os.path.join(vm.working_dir, 'startup.vpc')
assert os.path.exists(filepath)
with open(filepath) as f:
assert f.read() == content
def test_update_startup_script_h(vm):
content = "setname %h\n"
vm.name = "pc1"