mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Merge branch '2.2' into 3.0
# Conflicts: # gns3server/controller/__init__.py # gns3server/crash_report.py # gns3server/static/web-ui/index.html # gns3server/static/web-ui/main.96be36058f5df0ca7e7f.js # gns3server/utils/images.py # gns3server/version.py # requirements.txt # tests/compute/docker/test_docker_vm.py # tests/controller/test_controller.py
This commit is contained in:
commit
b3dfb87622
46 files changed
+2155
-93
No files matched your search
@@ -364,6 +364,31 @@ async def test_install_base_configs(controller, config, tmpdir):
|
||||
assert f.read() == 'test'
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"builtin_disk",
|
||||
[
|
||||
"empty8G.qcow2",
|
||||
"empty10G.qcow2",
|
||||
"empty20G.qcow2",
|
||||
"empty30G.qcow2",
|
||||
"empty40G.qcow2",
|
||||
"empty50G.qcow2",
|
||||
"empty100G.qcow2",
|
||||
"empty150G.qcow2",
|
||||
"empty200G.qcow2",
|
||||
"empty250G.qcow2",
|
||||
"empty500G.qcow2",
|
||||
"empty1T.qcow2"
|
||||
]
|
||||
)
|
||||
async def test_install_builtin_disks(controller, config, tmpdir, builtin_disk):
|
||||
|
||||
config.set_section_config("Server", {"images_path": str(tmpdir)})
|
||||
controller._install_builtin_disks()
|
||||
# we only install Qemu empty disks at this time
|
||||
assert os.path.exists(str(tmpdir / "QEMU" / builtin_disk))
|
||||
|
||||
|
||||
def test_appliances(controller, config, tmpdir):
|
||||
|
||||
my_appliance = {
|
||||
|
||||
Reference in new issue
Block a user