rms/gns3-gui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-gui.git synced 2026-05-17 00:46:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3/dialogs/appliance_wizard.py
#	gns3/node.py
#	gns3/version.py
This commit is contained in:
grossmj
2018-08-07 21:02:10 +07:00
parent ffc08361ce 5b56d54030
commit 5da8e77d01
12 changed files with 115 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/registry/test_config.py
View File

@@ -344,7 +344,7 @@ def test_add_appliance_with_boot_priority(empty_config, linux_microcore_img):
"path": linux_microcore_img
}
]
config["boot_priority"] = "dc"
config["qemu"]["boot_priority"] = "dc"
empty_config.add_appliance(config, "local")
assert empty_config._config["Qemu"]["vms"][0]["boot_priority"] == "dc"