NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	README.md
#	dev-requirements.txt
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.df8c319a3da6fb0e3629.js
#	gns3server/version.py
#	requirements.txt
#	setup.py
#	tests/compute/docker/test_docker_vm.py
#	tests/controller/test_import_project.py
This commit is contained in:
grossmj committed 2024-10-31 12:54:35 +10:00
2 parents a7b56739a9 753135a80d
commit c4fcb43e78
24 files changed
+648 -312
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/compute/docker/test_docker_vm.py
+30 -30
View File
@@ -121,9 +121,9 @@ async def test_create(compute_project, manager):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -172,9 +172,9 @@ async def test_create_with_tag(compute_project, manager):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -232,9 +232,9 @@ async def test_create_vnc(compute_project, manager):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -378,9 +378,9 @@ async def test_create_start_cmd(compute_project, manager):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"Entrypoint": ["/gns3/init.sh"],
"Cmd": ["/bin/ls"],
@@ -491,9 +491,9 @@ async def test_create_image_not_available(compute_project, manager):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -547,9 +547,9 @@ async def test_create_with_user(compute_project, manager):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host",
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -651,9 +651,9 @@ async def test_create_with_extra_volumes_duplicate_1_image(compute_project, mana
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -707,9 +707,9 @@ async def test_create_with_extra_volumes_duplicate_2_user(compute_project, manag
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -763,9 +763,9 @@ async def test_create_with_extra_volumes_duplicate_3_subdir(compute_project, man
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -819,9 +819,9 @@ async def test_create_with_extra_volumes_duplicate_4_backslash(compute_project,
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -870,9 +870,9 @@ async def test_create_with_extra_volumes_duplicate_5_subdir_issue_1595(compute_p
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -921,9 +921,9 @@ async def test_create_with_extra_volumes_duplicate_6_subdir_issue_1595(compute_p
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -988,9 +988,9 @@ async def test_create_with_extra_volumes(compute_project, manager):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -1265,9 +1265,9 @@ async def test_update(vm):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",
@@ -1347,9 +1347,9 @@ async def test_update_running(vm):
],
"Privileged": True,
"Memory": 0,
"NanoCpus": 0
"NanoCpus": 0,
"UsernsMode": "host"
},
"UsernsMode": "host",
"Volumes": {},
"NetworkDisabled": True,
"Hostname": "test",