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 
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
This commit is contained in:
Julien Duponchelle committed 2015-04-29 14:25:44 +02:00
2 parents 5f6d1bfdd6 b9bc73fd01
commit f8f6f5dc5d
5 files changed
+82 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/modules/test_manager.py
+1 -1
View File
@@ -102,7 +102,7 @@ def test_get_abs_image_path(qemu, tmpdir):
def test_get_relative_image_path(qemu, tmpdir):
os.makedirs(str(tmpdir / "Qemu"))
os.makedirs(str(tmpdir / "QEMU"))
path1 = str(tmpdir / "test1.bin")
open(path1, 'w+').close()