Skip to content

Commit

Permalink
Fix unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Jarred Wilson committed Sep 6, 2023
1 parent 6d031c7 commit 6843f00
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 69 deletions.
2 changes: 2 additions & 0 deletions tests/unit/commands/test_list_extensions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def test_command(emitter, command):
gnome-3-34 core18
gnome-3-38 core20
kde-neon core18, core20, core22
qt-framework core22
ros1-noetic core20
ros2-foxy core20
ros2-humble core22"""
Expand All @@ -68,6 +69,7 @@ def test_command_extension_dups(emitter, command):
gnome-3-34 core18
gnome-3-38 core20
kde-neon core18, core20, core22
qt-framework core22
ros1-noetic core20
ros2-foxy core20
ros2-humble core22"""
Expand Down
111 changes: 42 additions & 69 deletions tests/unit/extensions/test_qt_framework.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ def qt_framework_extension_with_build_snap():
return qt_framework.QTFramework(
yaml_data={
"base": "core22",
"parts": {
"part1": {
"build-snaps": ["qt-framework-sdk/latest/stable"]
}
},
"parts": {"part1": {"build-snaps": ["qt-framework-sdk/latest/stable"]}},
},
arch="amd64",
target_arch="amd64",
Expand All @@ -52,9 +48,7 @@ def qt_framework_extension_with_default_build_snap_from_latest_edge():
return qt_framework.QTFramework(
yaml_data={
"base": "core22",
"parts": {
"part1": {"build-snaps": ["qt-framework-sdk/latest/edge"]}
},
"parts": {"part1": {"build-snaps": ["qt-framework-sdk/latest/edge"]}},
},
arch="amd64",
target_arch="amd64",
Expand Down Expand Up @@ -82,21 +76,24 @@ def test_get_app_snippet(qt_framework_extension):
assert qt_framework_extension.get_app_snippet() == {
"command-chain": ["snap/command-chain/desktop-launch"],
"plugs": ["desktop", "desktop-legacy", "opengl", "wayland", "x11"],
"environment": {
"QT_PLUGIN_PATH": "$SNAP/qt-framework/opt/qt5-15/plugins:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins",
},
}


def test_get_root_snippet(qt_framework_extension):
assert qt_framework_extension.get_root_snippet() == {
"assumes": ["snapd2.43"],
"compression": "lzo",
"environment": {"SNAP_DESKTOP_RUNTIME": "$SNAP/kf5"},
"environment": {"SNAP_DESKTOP_RUNTIME": "$SNAP/qt-framework"},
"hooks": {
"configure": {
"plugs": ["desktop"],
"command-chain": ["snap/command-chain/hooks-configure-desktop"],
"command-chain": ["snap/command-chain/hooks-configure-fonts"],
}
},
"layout": {"/usr/share/X11": {"symlink": "$SNAP/kf5/usr/share/X11"}},
"layout": {"/usr/share/X11": {"symlink": "$SNAP/qt-framework/usr/share/X11"}},
"plugs": {
"desktop": {"mount-host-font-cache": False},
"icon-themes": {
Expand All @@ -110,10 +107,9 @@ def test_get_root_snippet(qt_framework_extension):
"default-provider": "gtk-common-themes",
},
"qt-framework": {
"content": "qt-framework-all",
"interface": "content",
"default-provider": "qt-framework",
"target": "$SNAP/kf5",
"target": "$SNAP/qt-framework",
},
},
}
Expand All @@ -123,14 +119,14 @@ def test_get_root_snippet_with_external_sdk(qt_framework_extension_with_build_sn
assert qt_framework_extension_with_build_snap.get_root_snippet() == {
"assumes": ["snapd2.43"],
"compression": "lzo",
"environment": {"SNAP_DESKTOP_RUNTIME": "$SNAP/kf5"},
"environment": {"SNAP_DESKTOP_RUNTIME": "$SNAP/qt-framework"},
"hooks": {
"configure": {
"plugs": ["desktop"],
"command-chain": ["snap/command-chain/hooks-configure-desktop"],
"command-chain": ["snap/command-chain/hooks-configure-fonts"],
}
},
"layout": {"/usr/share/X11": {"symlink": "$SNAP/kf5/usr/share/X11"}},
"layout": {"/usr/share/X11": {"symlink": "$SNAP/qt-framework/usr/share/X11"}},
"plugs": {
"desktop": {"mount-host-font-cache": False},
"icon-themes": {
Expand All @@ -144,10 +140,9 @@ def test_get_root_snippet_with_external_sdk(qt_framework_extension_with_build_sn
"default-provider": "gtk-common-themes",
},
"qt-framework": {
"content": "qt-framework-all",
"interface": "content",
"default-provider": "qt-framework",
"target": "$SNAP/kf5",
"target": "$SNAP/qt-framework",
},
},
}
Expand All @@ -168,58 +163,39 @@ def test_get_part_snippet_latest_edge(

@staticmethod
def assert_get_part_snippet(qt_framework_instance):
assert qt_framework_instance.get_part_snippet() == {
assert qt_framework_instance.get_part_snippet(plugin_name="cmake") == {
"build-environment": [
{"PATH": "/snap/qt-framework-sdk/current/usr/bin${PATH:+:$PATH}"},
{
"PATH": (
"/snap/qt-framework-sdk/current/usr/bin${PATH:+:$PATH}"
)
"XDG_DATA_DIRS": "$CRAFT_STAGE/usr/share:/snap/qt-framework-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
},
{
"XDG_DATA_DIRS": (
"$CRAFT_STAGE/usr/share:/snap/qt-framework-sdk"
"/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
)
"SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/qt-framework-sdk/current:-DCMAKE_PREFIX_PATH=/snap/qt-framework-sdk/current/opt/qt6-5/snap/qt-framework-sdk/current/opt/qt6-4/snap/qt-framework-sdk/current/opt/qt6-2/snap/qt-framework-sdk/current/opt/qt5-15:-DZLIB_INCLUDE_DIR=/lib/x86_64-linux-gnu${SNAPCRAFT_CMAKE_ARGS:+:$SNAPCRAFT_CMAKE_ARGS}"
},
{
"SNAPCRAFT_CMAKE_ARGS": (
"-DCMAKE_FIND_ROOT_PATH="
"/snap/qt-framework-sdk/current"
"${SNAPCRAFT_CMAKE_ARGS:+:$SNAPCRAFT_CMAKE_ARGS}"
)
},
]
],
"build-packages": ["libgl1-mesa-dev"],
}


def test_get_part_snippet_with_external_sdk(qt_framework_extension_with_build_snap):
assert qt_framework_extension_with_build_snap.get_part_snippet() == {
"build-environment": [
{
"PATH": (
"/snap/qt-framework-sdk/current/"
"usr/bin${PATH:+:$PATH}"
)
},
{
"XDG_DATA_DIRS": (
"$CRAFT_STAGE/usr/share:/snap/qt-framework-sdk"
"/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
)
},
{
"SNAPCRAFT_CMAKE_ARGS": (
"-DCMAKE_FIND_ROOT_PATH="
"/snap/qt-framework-sdk/current"
"${SNAPCRAFT_CMAKE_ARGS:+:$SNAPCRAFT_CMAKE_ARGS}"
)
},
]
}
assert qt_framework_extension_with_build_snap.get_part_snippet(
plugin_name="cmake"
) == {
"build-environment": [
{"PATH": "/snap/qt-framework-sdk/current/usr/bin${PATH:+:$PATH}"},
{
"XDG_DATA_DIRS": "$CRAFT_STAGE/usr/share:/snap/qt-framework-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
},
{
"SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/qt-framework-sdk/current:-DCMAKE_PREFIX_PATH=/snap/qt-framework-sdk/current/opt/qt6-5/snap/qt-framework-sdk/current/opt/qt6-4/snap/qt-framework-sdk/current/opt/qt6-2/snap/qt-framework-sdk/current/opt/qt5-15:-DZLIB_INCLUDE_DIR=/lib/x86_64-linux-gnu${SNAPCRAFT_CMAKE_ARGS:+:$SNAPCRAFT_CMAKE_ARGS}"
},
],
"build-packages": ["libgl1-mesa-dev"],
}


def test_get_parts_snippet(qt_framework_extension):
source = get_extensions_data_dir() / "desktop" / "qt-framework"
source = get_extensions_data_dir() / "desktop" / "command-chain"

assert qt_framework_extension.get_parts_snippet() == {
"qt-framework/sdk": {
Expand All @@ -232,7 +208,7 @@ def test_get_parts_snippet(qt_framework_extension):


def test_get_parts_snippet_with_external_sdk(qt_framework_extension_with_build_snap):
source = get_extensions_data_dir() / "desktop" / "qt-framework"
source = get_extensions_data_dir() / "desktop" / "command-chain"

assert qt_framework_extension_with_build_snap.get_parts_snippet() == {
"qt-framework/sdk": {
Expand All @@ -246,14 +222,11 @@ def test_get_parts_snippet_with_external_sdk(qt_framework_extension_with_build_s
def test_get_parts_snippet_with_external_sdk_different_channel(
qt_framework_extension_with_default_build_snap_from_latest_edge,
):
source = get_extensions_data_dir() / "desktop" / "qt-framework"
assert (
qt_framework_extension_with_default_build_snap_from_latest_edge.get_parts_snippet()
== {
"qt-framework/sdk": {
"source": str(source),
"plugin": "make",
"make-parameters": ["PLATFORM_PLUG=qt-framework"],
}
source = get_extensions_data_dir() / "desktop" / "command-chain"
assert qt_framework_extension_with_default_build_snap_from_latest_edge.get_parts_snippet() == {
"qt-framework/sdk": {
"source": str(source),
"plugin": "make",
"make-parameters": ["PLATFORM_PLUG=qt-framework"],
}
)
}

0 comments on commit 6843f00

Please sign in to comment.