arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-17 05:48:58 +00:00
Code Issues Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
grossmj 2021-09-09 16:54:16 +09:30
parent a324459152
commit 43ca53a089
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/controller/node.py
View File

@ -296,8 +296,7 @@ class Node:
try: try:
if not val.startswith(":") and os.path.isabs(val): if not val.startswith(":") and os.path.isabs(val):
server_config = Config.instance().get_section_config("Server") default_symbol_directory = Config.instance().settings.Server.symbols_path
default_symbol_directory = os.path.expanduser(server_config.get("images_path", "~/GNS3/symbols"))
if os.path.commonprefix([default_symbol_directory, val]) != default_symbol_directory: if os.path.commonprefix([default_symbol_directory, val]) != default_symbol_directory:
val = os.path.basename(val) val = os.path.basename(val)
except OSError: except OSError:

4
tests/compute/qemu/test_qemu_vm.py
View File

@ -914,8 +914,8 @@ async def test_run_with_kvm_linux(linux_platform, vm):
async def test_run_with_kvm_linux_options_no_kvm(linux_platform, vm): async def test_run_with_kvm_linux_options_no_kvm(linux_platform, vm):
with patch("os.path.exists", return_value=True) as os_path: with patch("os.path.exists", return_value=True) as os_path:
vm.manager.config.set("Qemu", "enable_kvm", True) vm.manager.config.settings.Qemu.enable_hardware_acceleration = True
assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-no-kvm") is False assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-machine accel=tcg") is False
@pytest.mark.asyncio @pytest.mark.asyncio