mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-06-27 01:36:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

tests: Drop oci label/annotation separate tests

Browse Source 
We only do labels now, so no need to test both.
This commit is contained in:
Alexander Larsson
2019-12-19 18:01:00 +01:00
parent 883f4bf177
commit 86c9e55561
3 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Makefile-test-matrix.am.inc
View File

@@ -16,10 +16,8 @@ TEST_MATRIX= \
tests/test-bundle@user.wrap \
tests/test-bundle@system.wrap \
tests/test-bundle@system-norevokefs.wrap \
tests/test-oci-registry@user,annotations.wrap \
tests/test-oci-registry@user,labels.wrap \
tests/test-oci-registry@system,annotations.wrap \
tests/test-oci-registry@system,labels.wrap \
tests/test-oci-registry@user.wrap \
tests/test-oci-registry@system.wrap \
tests/test-auth@nocollections.wrap \
tests/test-auth@collections.wrap \
$(NULL)

2
tests/Makefile.am.inc
View File

@@ -182,7 +182,7 @@ TEST_MATRIX_SOURCE = \
tests/test-extensions.sh \
tests/test-bundle.sh{user+system+system-norevokefs} \
tests/test-oci.sh \
tests/test-oci-registry.sh{{user+system},{annotations+labels}} \
tests/test-oci-registry.sh{{user+system} \
tests/test-unsigned-summaries.sh \
tests/test-update-remote-configuration.sh \
tests/test-override.sh \

28
tests/test-oci-registry.sh
View File

@@ -25,14 +25,6 @@ skip_without_bwrap
echo "1..14"
if [ x${USE_OCI_LABELS-} == xyes ] ; then
URI_SUFFIX="?index=labels"
BUILD_BUNDLE_FLAGS="--oci-use-labels"
else
URI_SUFFIX=""
BUILD_BUNDLE_FLAGS=""
fi
# Start the fake registry server
httpd oci-registry-server.py .
@@ -43,15 +35,15 @@ setup_repo_no_add oci
# Add OCI bundles to it
${FLATPAK} build-bundle ${BUILD_BUNDLE_FLAGS} --runtime --oci $FL_GPGARGS repos/oci oci/platform-image org.test.Platform
${FLATPAK} build-bundle --runtime --oci $FL_GPGARGS repos/oci oci/platform-image org.test.Platform
$client add platform latest $(pwd)/oci/platform-image
${FLATPAK} build-bundle ${BUILD_BUNDLE_FLAGS} --oci $FL_GPGARGS repos/oci oci/app-image org.test.Hello
${FLATPAK} build-bundle --oci $FL_GPGARGS repos/oci oci/app-image org.test.Hello
$client add hello latest $(pwd)/oci/app-image
# Add an OCI remote
${FLATPAK} remote-add ${U} oci-registry "oci+http://127.0.0.1:${port}${URI_SUFFIX}"
${FLATPAK} remote-add ${U} oci-registry "oci+http://127.0.0.1:${port}"
# Check that the images we expect are listed
@@ -109,7 +101,7 @@ echo "ok install"
make_updated_app oci
${FLATPAK} build-bundle ${BUILD_BUNDLE_FLAGS} --oci $FL_GPGARGS repos/oci oci/app-image org.test.Hello
${FLATPAK} build-bundle --oci $FL_GPGARGS repos/oci oci/app-image org.test.Hello
$client add hello latest $(pwd)/oci/app-image
@@ -161,7 +153,7 @@ echo "ok change remote to non-OCI"
# Change it back and refetch
${FLATPAK} remote-modify ${U} --url=oci+http://127.0.0.1:${port}${URI_SUFFIX} oci-registry
${FLATPAK} remote-modify ${U} --url=oci+http://127.0.0.1:${port} oci-registry
${FLATPAK} update ${U} --appstream oci-registry
# Delete the remote, check that everything was removed
@@ -185,7 +177,7 @@ cat << EOF > org.test.Platform.flatpakref
Title=Test Platform
Name=org.test.Platform
Branch=master
Url=oci+http://127.0.0.1:${port}${URI_SUFFIX}
Url=oci+http://127.0.0.1:${port}
IsRuntime=true
EOF
@@ -212,12 +204,12 @@ echo "ok prune origin remote"
# Install from a (non-OCI) bundle, check that the repo-url is respected
${FLATPAK} build-bundle --runtime --repo-url "oci+http://127.0.0.1:${port}${URI_SUFFIX}" $FL_GPGARGS repos/oci org.test.Platform.flatpak org.test.Platform
${FLATPAK} build-bundle --runtime --repo-url "oci+http://127.0.0.1:${port}" $FL_GPGARGS repos/oci org.test.Platform.flatpak org.test.Platform
${FLATPAK} ${U} install -y --bundle org.test.Platform.flatpak
${FLATPAK} remotes -d > remotes-list
assert_file_has_content remotes-list "^platform-origin.*[ ]oci+http://127\.0\.0\.1:${port}${URI_SUFFIX}"
assert_file_has_content remotes-list "^platform-origin.*[ ]oci+http://127\.0\.0\.1:${port}"
assert_has_file $base/oci/platform-origin.index.gz
@@ -225,12 +217,12 @@ echo "ok install via bundle"
# Install an app from a bundle
${FLATPAK} build-bundle --repo-url "oci+http://127.0.0.1:${port}${URI_SUFFIX}" $FL_GPGARGS repos/oci org.test.Hello.flatpak org.test.Hello
${FLATPAK} build-bundle --repo-url "oci+http://127.0.0.1:${port}" $FL_GPGARGS repos/oci org.test.Hello.flatpak org.test.Hello
${FLATPAK} ${U} install -y --bundle org.test.Hello.flatpak
${FLATPAK} remotes -d > remotes-list
assert_file_has_content remotes-list "^hello-origin.*[ ]oci+http://127\.0\.0\.1:${port}${URI_SUFFIX}"
assert_file_has_content remotes-list "^hello-origin.*[ ]oci+http://127\.0\.0\.1:${port}"
assert_has_file $base/oci/hello-origin.index.gz