From cb70cfecd7e2466aa2ef4f94fa74c8d75803c10a Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 16 May 2016 19:37:47 +0200 Subject: [PATCH] Fix docker test --- tests/compute/docker/test_docker_vm.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/compute/docker/test_docker_vm.py b/tests/compute/docker/test_docker_vm.py index 4be15537..4dec6e43 100644 --- a/tests/compute/docker/test_docker_vm.py +++ b/tests/compute/docker/test_docker_vm.py @@ -93,7 +93,7 @@ def test_create(loop, project, manager): { "CapAdd": ["ALL"], "Binds": [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")) ], "Privileged": True @@ -133,7 +133,7 @@ def test_create_vnc(loop, project, manager): { "CapAdd": ["ALL"], "Binds": [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")), '/tmp/.X11-unix/:/tmp/.X11-unix/' ], @@ -175,7 +175,7 @@ def test_create_start_cmd(loop, project, manager): { "CapAdd": ["ALL"], "Binds": [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")) ], "Privileged": True @@ -213,7 +213,7 @@ def test_create_environment(loop, project, manager): { "CapAdd": ["ALL"], "Binds": [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")) ], "Privileged": True @@ -267,7 +267,7 @@ def test_create_image_not_available(loop, project, manager): { "CapAdd": ["ALL"], "Binds": [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")) ], "Privileged": True @@ -484,7 +484,7 @@ def test_update(loop, vm): { "CapAdd": ["ALL"], "Binds": [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")) ], "Privileged": True @@ -551,7 +551,7 @@ def test_update_running(loop, vm): { "CapAdd": ["ALL"], "Binds": [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")) ], "Privileged": True @@ -827,7 +827,7 @@ def test_mount_binds(vm, tmpdir): dst = os.path.join(vm.working_dir, "test/experimental") assert vm._mount_binds(image_infos) == [ - "{}:/gns3:ro".format(get_resource("hypervisor/docker/resources")), + "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network")), "{}:{}".format(dst, "/test/experimental") ]