arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-06-26 18:02:44 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	tests/utils/test_images.py
This commit is contained in:
grossmj 2024-12-16 18:31:57 +07:00
commit b84bedffec
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/utils/test_images.py
View File

@ -161,7 +161,7 @@ async def test_list_images(tmpdir, config):
config.settings.Server.images_path = str(tmpdir / "images1") config.settings.Server.images_path = str(tmpdir / "images1")
config.settings.Server.additional_images_paths = "/tmp/null24564;" + str(tmpdir / "images2") config.settings.Server.additional_images_paths = "/tmp/null24564;" + str(tmpdir / "images2")
assert await list_images("dynamips") == [ assert sorted(await list_images("dynamips"), key=lambda k: k['filename']) == [
{ {
'filename': 'ios_image_1.image', 'filename': 'ios_image_1.image',
'filesize': 7, 'filesize': 7,
@ -177,18 +177,18 @@ async def test_list_images(tmpdir, config):
] ]
if sys.platform.startswith("linux"): if sys.platform.startswith("linux"):
assert await list_images("iou") == [ assert sorted(await list_images("iou"), key=lambda k: k['filename']) == [
{
'filename': 'iou64.bin',
'filesize': 7,
'md5sum': 'c73626d23469519894d58bc98bee9655',
'path': 'iou64.bin'
},
{ {
'filename': 'iou32.bin', 'filename': 'iou32.bin',
'filesize': 7, 'filesize': 7,
'md5sum': 'e573e8f5c93c6c00783f20c7a170aa6c', 'md5sum': 'e573e8f5c93c6c00783f20c7a170aa6c',
'path': 'iou32.bin' 'path': 'iou32.bin'
},
{
'filename': 'iou64.bin',
'filesize': 7,
'md5sum': 'c73626d23469519894d58bc98bee9655',
'path': 'iou64.bin'
} }
] ]