Directory organisation

This commit is contained in:
Julien Duponchelle 2015-05-28 15:25:13 +02:00
parent 0f66856fa7
commit 94cce21a19
5 changed files with 8 additions and 8 deletions

View File

@ -78,7 +78,7 @@ def empty_config(tmpdir):
def test_add_images_guest(empty_config, linux_microcore_img): def test_add_images_guest(empty_config, linux_microcore_img):
with open("devices/qemu/microcore-linux.json") as f: with open("devices/microcore-linux.json") as f:
config = json.load(f) config = json.load(f)
image = Image(linux_microcore_img) image = Image(linux_microcore_img)
image.version = "3.4.1" image.version = "3.4.1"
@ -109,7 +109,7 @@ def test_add_images_guest(empty_config, linux_microcore_img):
def test_add_images_cdrom(empty_config, linux_microcore_img): def test_add_images_cdrom(empty_config, linux_microcore_img):
with open("devices/qemu/hp-vsr1001.json") as f: with open("devices/hp-vsr1001.json") as f:
config = json.load(f) config = json.load(f)
hda = os.path.join(empty_config.images_dir, "QEMU", "vsr1000-hp.img") hda = os.path.join(empty_config.images_dir, "QEMU", "vsr1000-hp.img")
@ -155,7 +155,7 @@ def test_add_images_cdrom(empty_config, linux_microcore_img):
def test_add_images_router_two_disk(empty_config): def test_add_images_router_two_disk(empty_config):
with open("devices/qemu/arista-veos.json") as f: with open("devices/arista-veos.json") as f:
config = json.load(f) config = json.load(f)
image = MagicMock() image = MagicMock()
@ -198,7 +198,7 @@ def test_add_images_router_two_disk(empty_config):
def test_add_images_uniq(empty_config, linux_microcore_img): def test_add_images_uniq(empty_config, linux_microcore_img):
with open("devices/qemu/microcore-linux.json") as f: with open("devices/microcore-linux.json") as f:
config = json.load(f) config = json.load(f)
image = Image(linux_microcore_img) image = Image(linux_microcore_img)
@ -213,7 +213,7 @@ def test_add_images_uniq(empty_config, linux_microcore_img):
def test_add_images_two_disk_one_missing(empty_config): def test_add_images_two_disk_one_missing(empty_config):
with open("devices/qemu/arista-veos.json") as f: with open("devices/arista-veos.json") as f:
config = json.load(f) config = json.load(f)
image = MagicMock() image = MagicMock()
@ -228,7 +228,7 @@ def test_add_images_two_disk_one_missing(empty_config):
def test_save(empty_config, linux_microcore_img): def test_save(empty_config, linux_microcore_img):
with open("devices/qemu/microcore-linux.json") as f: with open("devices/microcore-linux.json") as f:
config = json.load(f) config = json.load(f)
image = Image(linux_microcore_img) image = Image(linux_microcore_img)

View File

@ -25,7 +25,7 @@ from gns3registry.registry import Registry
def test_detect_image(linux_microcore_img): def test_detect_image(linux_microcore_img):
with open("devices/qemu/microcore-linux.json") as f: with open("devices/microcore-linux.json") as f:
config = json.load(f) config = json.load(f)
registry = Registry() registry = Registry()
@ -36,7 +36,7 @@ def test_detect_image(linux_microcore_img):
def test_detect_two_image(linux_microcore_img): def test_detect_two_image(linux_microcore_img):
with open("devices/qemu/microcore-linux.json") as f: with open("devices/microcore-linux.json") as f:
config = json.load(f) config = json.load(f)
registry = Registry() registry = Registry()