Skip to content

Commit 18d30b4

Browse files
committed
tests: Add a test for compose policy argument
1 parent 056354c commit 18d30b4

File tree

5 files changed

+63
-1
lines changed

5 files changed

+63
-1
lines changed

tests/Makefile.am.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ dist_installed_test_data = \
6161
tests/org.flatpak_builder.gui.desktop \
6262
tests/org.flatpak_builder.gui.json \
6363
tests/org.flatpak_builder.gui.metainfo.xml \
64+
tests/org.flatpak.appstream_media.json \
65+
tests/org.test.Hello-256.png \
6466
$(NULL)
6567

6668
installed_test_keyringdir = $(installed_testdir)/test-keyring

tests/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ if get_option('installed_tests')
108108
'org.flatpak_builder.gui.desktop',
109109
'org.flatpak_builder.gui.json',
110110
'org.flatpak_builder.gui.metainfo.xml',
111+
'org.flatpak.appstream_media.json',
112+
'org.test.Hello-256.png',
111113

112114
install_dir: installed_testdir,
113115
install_mode: 'rw-r--r--',
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"id": "org.flatpak.appstream_media",
3+
"runtime": "org.test.Platform",
4+
"sdk": "org.test.Sdk",
5+
"rename-desktop-file": "org.flatpak_builder.gui.desktop",
6+
"rename-appdata-file": "org.flatpak_builder.gui.metainfo.xml",
7+
"rename-icon": "org.test.Hello-256",
8+
"command": "hello",
9+
"modules": [
10+
{
11+
"name": "appstream_media",
12+
"buildsystem": "simple",
13+
"build-commands": [
14+
"mkdir -p ${FLATPAK_DEST}/bin ${FLATPAK_DEST}/share/metainfo ${FLATPAK_DEST}/share/applications",
15+
"mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/256x256/apps",
16+
"cp -vf hello.sh ${FLATPAK_DEST}/bin/hello",
17+
"cp -vf org.flatpak_builder.gui.metainfo.xml ${FLATPAK_DEST}/share/metainfo",
18+
"cp -vf org.flatpak_builder.gui.desktop ${FLATPAK_DEST}/share/applications",
19+
"cp -vf org.test.Hello-256.png ${FLATPAK_DEST}/share/icons/hicolor/256x256/apps"
20+
],
21+
"sources": [
22+
{
23+
"type": "script",
24+
"dest-filename": "hello.sh",
25+
"commands": [
26+
"echo \"Hello world, from a sandbox\""
27+
]
28+
},
29+
{
30+
"type": "file",
31+
"path": "org.flatpak_builder.gui.desktop"
32+
},
33+
{
34+
"type": "file",
35+
"path": "org.flatpak_builder.gui.metainfo.xml"
36+
},
37+
{
38+
"type": "file",
39+
"path": "org.test.Hello-256.png"
40+
}
41+
]
42+
}
43+
]
44+
}

tests/org.test.Hello-256.png

77.4 KB
Loading

tests/test-builder.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set -euo pipefail
2323

2424
skip_without_fuse
2525

26-
echo "1..8"
26+
echo "1..9"
2727

2828
setup_repo
2929
install_repo
@@ -53,6 +53,8 @@ cp $(dirname $0)/org.flatpak_builder.gui.desktop .
5353
cp $(dirname $0)/org.flatpak_builder.gui.json .
5454
cp $(dirname $0)/org.flatpak_builder.gui.metainfo.xml .
5555
cp $(dirname $0)/org.test.Hello.png .
56+
cp $(dirname $0)/org.test.Hello-256.png .
57+
cp $(dirname $0)/org.flatpak.appstream_media.json .
5658
mkdir include1
5759
cp $(dirname $0)/module1.json include1/
5860
cp $(dirname $0)/module1.yaml include1/
@@ -144,3 +146,15 @@ ostree checkout --repo=$REPO/repo_sc -U screenshots/$(flatpak --default-arch) ou
144146
find outdir_sc -path "*/icons/64x64/org.test.Hello.png" -type f | grep -q .
145147

146148
echo "ok screenshot ref commit"
149+
150+
# test compose partial url
151+
${FLATPAK_BUILDER} --force-clean builddir_sc \
152+
--mirror-screenshots-url=https://example.org/media \
153+
--state-dir .fp-compose-url-policy \
154+
--compose-url-policy=partial \
155+
org.flatpak.appstream_media.json >&2
156+
# we test for the icon tag instead of screenshot
157+
# the former works offline the latter does not
158+
gzip -cdq builddir_sc/files/share/app-info/xmls/org.flatpak.appstream_media.xml.gz|grep -Eq '>org/flatpak/appstream_media/[^/]+/icons/128x128/org.flatpak.appstream_media.png</icon>'
159+
160+
echo "ok compose partial url"

0 commit comments

Comments
 (0)