"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tests/test-repo.sh" between
flatpak-1.8.2.tar.xz and flatpak-1.8.3.tar.xz

About: Flatpak is a Linux application sandboxing and distribution framework.

test-repo.sh  (flatpak-1.8.2.tar.xz)	:	test-repo.sh  (flatpak-1.8.3.tar.xz)
skipping to change at line 329		skipping to change at line 329
if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then		if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then
COPY_COLLECTION_ID=org.test.Collection.test		COPY_COLLECTION_ID=org.test.Collection.test
copy_collection_args=--collection-id=${COLLECTION_ID}		copy_collection_args=--collection-id=${COLLECTION_ID}
else		else
COPY_COLLECTION_ID=		COPY_COLLECTION_ID=
copy_collection_args=		copy_collection_args=
fi		fi
ostree init --repo=repos/test-copy --mode=archive-z2 ${copy_collection_args}		ostree init --repo=repos/test-copy --mode=archive-z2 ${copy_collection_args}
${FLATPAK} build-commit-from --end-of-life=Reason1 --src-repo=repos/test repos/t est-copy app/org.test.Hello/$ARCH/master		${FLATPAK} build-commit-from --no-update-summary --end-of-life=Reason1 --src-rep o=repos/test repos/test-copy app/org.test.Hello/$ARCH/master
update_repo test-copy ${COPY_COLLECTION_ID}		update_repo test-copy ${COPY_COLLECTION_ID}
# Ensure we have no eol app in appdata		# Ensure we have no eol app in appdata
if ! ostree show --repo=repos/test-copy appstream/${ARCH} > /dev/null; then		if ! ostree show --repo=repos/test-copy appstream/${ARCH} > /dev/null; then
assert_not_reached "No appstream branch"		assert_not_reached "No appstream branch"
fi		fi
ostree cat --repo=repos/test-copy appstream/${ARCH} /appstream.xml.gz | gunzip - d > appdata.xml		ostree cat --repo=repos/test-copy appstream/${ARCH} /appstream.xml.gz | gunzip - d > appdata.xml
assert_not_file_has_content appdata.xml "org\.test\.Hello\.desktop"		assert_not_file_has_content appdata.xml "org\.test\.Hello\.desktop"
${FLATPAK} repo --branches repos/test-copy > branches-log		${FLATPAK} repo --branches repos/test-copy > branches-log
skipping to change at line 390		skipping to change at line 390
if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then		if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then
REBASE_COLLECTION_ID=org.test.Collection.rebase		REBASE_COLLECTION_ID=org.test.Collection.rebase
rebase_collection_args=--collection-id=${REBASE_COLLECTION_ID}		rebase_collection_args=--collection-id=${REBASE_COLLECTION_ID}
else		else
REBASE_COLLECTION_ID=		REBASE_COLLECTION_ID=
rebase_collection_args=		rebase_collection_args=
fi		fi
ostree init --repo=repos/test-rebase --mode=archive-z2 ${rebase_collection_args}		ostree init --repo=repos/test-rebase --mode=archive-z2 ${rebase_collection_args}
${FLATPAK} build-commit-from --src-repo=repos/test ${FL_GPGARGS} repos/test-reba se app/org.test.Hello/$ARCH/master runtime/org.test.Hello.Locale/$ARCH/master		${FLATPAK} build-commit-from --no-update-summary --src-repo=repos/test ${FL_GPGA RGS} repos/test-rebase app/org.test.Hello/$ARCH/master runtime/org.test.Hello.Lo cale/$ARCH/master
update_repo test-rebase ${REBASE_COLLECTION_ID}		update_repo test-rebase ${REBASE_COLLECTION_ID}
flatpak remote-add ${U} --gpg-import=${FL_GPG_HOMEDIR}/pubring.gpg test-rebase " http://127.0.0.1:${port}/test-rebase"		flatpak remote-add ${U} --gpg-import=${FL_GPG_HOMEDIR}/pubring.gpg test-rebase " http://127.0.0.1:${port}/test-rebase"
${FLATPAK} ${U} install -y test-rebase org.test.Hello		${FLATPAK} ${U} install -y test-rebase org.test.Hello
assert_not_has_dir $HOME/.var/app/org.test.Hello		assert_not_has_dir $HOME/.var/app/org.test.Hello
${CMD_PREFIX} flatpak run --command=bash org.test.Hello -c 'echo foo > $XDG_DATA _HOME/a-file'		${CMD_PREFIX} flatpak run --command=bash org.test.Hello -c 'echo foo > $XDG_DATA _HOME/a-file'
assert_has_dir $HOME/.var/app/org.test.Hello		assert_has_dir $HOME/.var/app/org.test.Hello
assert_has_file $HOME/.var/app/org.test.Hello/data/a-file		assert_has_file $HOME/.var/app/org.test.Hello/data/a-file
${FLATPAK} build-commit-from --end-of-life-rebase=org.test.Hello=org.test.NewHel lo --src-repo=repos/test ${FL_GPGARGS} repos/test-rebase app/org.test.Hello/$ARC H/master runtime/org.test.Hello.Locale/$ARCH/master		${FLATPAK} build-commit-from --no-update-summary --end-of-life-rebase=org.test.H ello=org.test.NewHello --src-repo=repos/test ${FL_GPGARGS} repos/test-rebase app /org.test.Hello/$ARCH/master runtime/org.test.Hello.Locale/$ARCH/master
GPGARGS="${FL_GPGARGS}" $(dirname $0)/make-test-app.sh repos/test-rebase org.tes t.NewHello master "${REBASE_COLLECTION_ID}" "NEW" > /dev/null		GPGARGS="${FL_GPGARGS}" $(dirname $0)/make-test-app.sh repos/test-rebase org.tes t.NewHello master "${REBASE_COLLECTION_ID}" "NEW" > /dev/null
		update_repo test-rebase
${FLATPAK} ${U} update -y org.test.Hello		${FLATPAK} ${U} update -y org.test.Hello
# Make sure we got the new version installed		# Make sure we got the new version installed
assert_has_dir $FL_DIR/app/org.test.NewHello/$ARCH/master/active/files		assert_has_dir $FL_DIR/app/org.test.NewHello/$ARCH/master/active/files
assert_not_has_file $FL_DIR/app/org.test.NewHello/$ARCH/master/active/files		assert_not_has_file $FL_DIR/app/org.test.NewHello/$ARCH/master/active/files
${CMD_PREFIX} flatpak run --command=bash org.test.NewHello -c 'echo foo > $XDG_D ATA_HOME/another-file'		${CMD_PREFIX} flatpak run --command=bash org.test.NewHello -c 'echo foo > $XDG_D ATA_HOME/another-file'
# Ensure we migrated the app data		# Ensure we migrated the app data
skipping to change at line 445		skipping to change at line 446
${FLATPAK} ${U} remotes -d | grep ^test-repo > repo-info		${FLATPAK} ${U} remotes -d | grep ^test-repo > repo-info
assert_file_has_content repo-info "/test-gpg3"		assert_file_has_content repo-info "/test-gpg3"
# Make sure we also get new installs from the new repo		# Make sure we also get new installs from the new repo
GPGARGS="${FL_GPGARGS2}" make_updated_app test-gpg3 org.test.Collection.test mas ter		GPGARGS="${FL_GPGARGS2}" make_updated_app test-gpg3 org.test.Collection.test mas ter
update_repo test-gpg3 org.test.Collection.test		update_repo test-gpg3 org.test.Collection.test
${FLATPAK} ${U} install -y test-repo org.test.Hello		${FLATPAK} ${U} install -y test-repo org.test.Hello
assert_file_has_content $FL_DIR/app/org.test.Hello/$ARCH/master/active/files/bin /hello.sh UPDATED		assert_file_has_content $FL_DIR/app/org.test.Hello/$ARCH/master/active/files/bin /hello.sh UPDATED
		# Switch back to the old url to unconfuse other tests
		UPDATE_REPO_ARGS="--redirect-url=" update_repo
		${FLATPAK} ${U} remote-modify --url="http://127.0.0.1:${port}/test" test-repo
		# Also remove app so we can install the older one from the previous repo
		${FLATPAK} ${U} uninstall -y org.test.Hello
ok "redirect url and gpg key"		ok "redirect url and gpg key"
		${FLATPAK} ${U} install -y -v test-repo org.test.Hello
# Test https://github.com/flatpak/flatpak/issues/3222		# Test https://github.com/flatpak/flatpak/issues/3222
mkdir -p $FL_DIR/repo/refs/mirrors/org.test.Collection.test/app/org.test.Hello/$ ARCH/		mkdir -p $FL_DIR/repo/refs/mirrors/org.test.Collection.test/app/org.test.Hello/$ ARCH/
cp $FL_DIR/repo/refs/remotes/test-repo/app/org.test.Hello/$ARCH/master $FL_DIR/r epo/refs/mirrors/org.test.Collection.test/app/org.test.Hello/$ARCH/		cp $FL_DIR/repo/refs/remotes/test-repo/app/org.test.Hello/$ARCH/master $FL_DIR/r epo/refs/mirrors/org.test.Collection.test/app/org.test.Hello/$ARCH/
make_updated_app test-gpg3 org.test.Collection.test master UPDATE2		make_updated_app test org.test.Collection.test master UPDATE2
${FLATPAK} ${U} update -y org.test.Hello		${FLATPAK} ${U} update -y org.test.Hello
assert_not_has_file $FL_DIR/repo/refs/mirrors/org.test.Collection.test/app/org.t est.Hello/$ARCH/master		assert_not_has_file $FL_DIR/repo/refs/mirrors/org.test.Collection.test/app/org.t est.Hello/$ARCH/master
assert_has_file $FL_DIR/repo/refs/remotes/test-repo/app/org.test.Hello/$ARCH/mas ter		assert_has_file $FL_DIR/repo/refs/remotes/test-repo/app/org.test.Hello/$ARCH/mas ter
ok "mirror ref deletion on update"		ok "mirror ref deletion on update"
${FLATPAK} ${U} list --arch=$ARCH --columns=ref > list-log		${FLATPAK} ${U} list --arch=$ARCH --columns=ref > list-log
assert_file_has_content list-log "org\.test\.Hello"		assert_file_has_content list-log "org\.test\.Hello"
assert_file_has_content list-log "org\.test\.Platform"		assert_file_has_content list-log "org\.test\.Platform"
End of changes. 7 change blocks.
4 lines changed or deleted		14 lines changed or added

---