arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-15 21:08:55 +00:00
Code Issues Releases Wiki Activity

Fix 1.5 merge

Browse Source
This commit is contained in:
Julien Duponchelle 2016-04-12 16:21:35 +02:00
parent 183d02ded5
commit ad7ca86f32
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
gns3server/modules/docker/resources/etc/udhcpc/default.script → gns3server/hypervisor/docker/resources/etc/udhcpc/default.script
View File

BIN
gns3server/modules/docker/resources/bin/busybox
View File

Binary file not shown.

8
tests/hypervisor/test_project.py
View File

@ -348,7 +348,8 @@ def test_export_with_images(tmpdir):
"""
Fix absolute image path
"""
project = Project()
project_id = str(uuid.uuid4())
project = Project(project_id=project_id)
path = project.path
os.makedirs(str(tmpdir / "IOS"))
@ -371,7 +372,7 @@ def test_export_with_images(tmpdir):
with open(os.path.join(path, "test.gns3"), 'w+') as f:
json.dump(topology, f)
with patch("gns3server.modules.Dynamips.get_images_directory", return_value=str(tmpdir / "IOS"),):
with patch("gns3server.hypervisor.Dynamips.get_images_directory", return_value=str(tmpdir / "IOS"),):
z = project.export(include_images=True)
with open(str(tmpdir / 'zipfile.zip'), 'wb') as f:
for data in z:
@ -382,7 +383,8 @@ def test_export_with_images(tmpdir):
def test_export_with_vm(tmpdir):
project = Project()
project_id = str(uuid.uuid4())
project = Project(project_id=project_id)
path = project.path
os.makedirs(os.path.join(path, "vm-1", "dynamips"))