From 75bb06563a3162115c93b503ca8ea9ff6ee0ee6e Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 30 Aug 2021 13:04:24 +0930 Subject: [PATCH] Fix tests --- gns3server/compute/builtin/nodes/nat.py | 2 +- tests/compute/qemu/test_qemu_manager.py | 1 - tests/compute/test_manager.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gns3server/compute/builtin/nodes/nat.py b/gns3server/compute/builtin/nodes/nat.py index 86a3d2ff..29d17959 100644 --- a/gns3server/compute/builtin/nodes/nat.py +++ b/gns3server/compute/builtin/nodes/nat.py @@ -36,7 +36,7 @@ class Nat(Cloud): def __init__(self, name, node_id, project, manager, ports=None): - allowed_interfaces = Config.instance().get_section_config("Server").get("allowed_interfaces", None) + allowed_interfaces = Config.instance().settings.Server.allowed_interfaces if allowed_interfaces: allowed_interfaces = allowed_interfaces.split(',') if sys.platform.startswith("linux"): diff --git a/tests/compute/qemu/test_qemu_manager.py b/tests/compute/qemu/test_qemu_manager.py index 4fbec1a6..77be4e41 100644 --- a/tests/compute/qemu/test_qemu_manager.py +++ b/tests/compute/qemu/test_qemu_manager.py @@ -73,7 +73,6 @@ async def test_binary_list(monkeypatch, tmpdir): assert {"path": os.path.join(os.environ["PATH"], "qemu-kvm"), "version": version} in qemus assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x42"), "version": version} in qemus assert {"path": os.path.join(os.environ["PATH"], "hello"), "version": version} not in qemus - assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x86_64-spice"), "version": version} not in qemus qemus = await Qemu.binary_list(["x86"]) diff --git a/tests/compute/test_manager.py b/tests/compute/test_manager.py index 9f32d545..3c27110c 100644 --- a/tests/compute/test_manager.py +++ b/tests/compute/test_manager.py @@ -173,7 +173,7 @@ def test_get_abs_image_recursive_ova(qemu, tmpdir, config): config.settings.Server.images_path = str(tmpdir / "images1") config.settings.Server.local = False - assert qemu.get_abs_image_path("test.ova/test1.bin") == path1 + assert qemu.get_abs_image_path("demo/test.ova/test1.bin") == path1 assert qemu.get_abs_image_path("test.ova/test2.bin") == path2 # Absolute path assert qemu.get_abs_image_path(str(path1)) == path1