summaryrefslogtreecommitdiff
path: root/tests/test-run.sh
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2019-04-04 14:37:26 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2019-04-09 09:18:15 +0000
commit3f746bc328c62fcc02d2b6891b172ad4398643ad (patch)
treefb8e8e13c328c646145db547becddd627b7f757b /tests/test-run.sh
parentcd3028abd00b5d6cf9ae7ce2d5aa1decdace424e (diff)
downloadflatpak-3f746bc328c62fcc02d2b6891b172ad4398643ad.tar.gz
tests: Fix test of non-canonical permissions
When installing via the child repo we now strip the permissions early so the import will fail instead of import and then canonicalize. Either is ok, as nothing should be non-canonical in real life. Closes: #2657 Approved by: alexlarsson
Diffstat (limited to 'tests/test-run.sh')
-rw-r--r--tests/test-run.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 8f9d5d7b..a6b66814 100644
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -395,9 +395,12 @@ flatpak build-finish --command=hello.sh app
ostree --repo=repos/test commit --owner-uid=0 --owner-gid=0 --no-xattrs ${FL_GPGARGS} --branch=app/org.test.Writable/$ARCH/stable app
update_repo
-${FLATPAK} ${U} install -y test-repo org.test.Writable
-
-assert_file_has_mode $FL_DIR/app/org.test.Writable/$ARCH/stable/active/files/a-dir 775
+# In the system-helper case this fails to install due to the permission canonicalization happening in the
+# child-repo making objects get the wrong checksum, whereas in the user case we successfully import it, but
+# it will have canonicalized permissions.
+if ${FLATPAK} ${U} install -y test-repo org.test.Writable; then
+ assert_file_has_mode $FL_DIR/app/org.test.Writable/$ARCH/stable/active/files/a-dir 775
+fi
echo "ok no world writable dir"