test-repo.sh (flatpak-1.15.2.tar.xz) | : | test-repo.sh (flatpak-1.15.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 442 | skipping to change at line 442 | |||
assert_not_has_dir $HOME/.var/app/org.test.Hello | assert_not_has_dir $HOME/.var/app/org.test.Hello | |||
${FLATPAK} run --command=bash org.test.Hello -c 'echo foo > $XDG_DATA_HOME/a-fil e' >&2 | ${FLATPAK} run --command=bash org.test.Hello -c 'echo foo > $XDG_DATA_HOME/a-fil e' >&2 | |||
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 --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 >&2 | ${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 >&2 | |||
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 | update_repo test-rebase | |||
# First do a --no-deploy update and check the old version is still installed | ||||
${FLATPAK} ${U} update -y --no-deploy org.test.Hello >&2 | ||||
assert_has_dir $HOME/.var/app/org.test.Hello | ||||
assert_has_file $HOME/.var/app/org.test.Hello/data/a-file | ||||
assert_not_has_dir $HOME/.var/app/org.test.NewHello | ||||
${FLATPAK} ${U} update -y org.test.Hello >&2 | ${FLATPAK} ${U} update -y org.test.Hello >&2 | |||
# 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 | |||
${FLATPAK} run --command=bash org.test.NewHello -c 'echo foo > $XDG_DATA_HOME/an other-file' >&2 | ${FLATPAK} run --command=bash org.test.NewHello -c 'echo foo > $XDG_DATA_HOME/an other-file' >&2 | |||
# Ensure we migrated the app data | # Ensure we migrated the app data | |||
assert_has_dir $HOME/.var/app/org.test.NewHello | assert_has_dir $HOME/.var/app/org.test.NewHello | |||
skipping to change at line 494 | skipping to change at line 501 | |||
${FLATPAK} ${U} info org.test.Platform > info-log | ${FLATPAK} ${U} info org.test.Platform > info-log | |||
assert_file_has_content info-log "End-of-life: Reason3" | assert_file_has_content info-log "End-of-life: Reason3" | |||
assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | |||
# Update the app to a different runtime branch | # Update the app to a different runtime branch | |||
make_updated_runtime "" "" "mainline" "" | make_updated_runtime "" "" "mainline" "" | |||
make_updated_app "" "" "" "UPDATED99" "" "mainline" | make_updated_app "" "" "" "UPDATED99" "" "mainline" | |||
# First update with --no-deploy and check the old runtime is still installed | ||||
${FLATPAK} ${U} update -y --no-deploy org.test.Hello >&2 | ||||
assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | ||||
assert_not_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/mainline/active/files | ||||
${FLATPAK} ${U} update -y org.test.Hello >&2 | ${FLATPAK} ${U} update -y org.test.Hello >&2 | |||
# The previous runtime should have been removed during the update | # The previous runtime should have been removed during the update | |||
assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/mainline/active/files | assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/mainline/active/files | |||
assert_not_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | assert_not_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | |||
# Revert things for future tests | # Revert things for future tests | |||
EXPORT_ARGS="" make_updated_runtime | EXPORT_ARGS="" make_updated_runtime | |||
make_updated_app "" "" "" "UPDATED100" "" "master" | make_updated_app "" "" "" "UPDATED100" "" "master" | |||
${FLATPAK} ${U} uninstall -y --all >&2 | ${FLATPAK} ${U} uninstall -y --all >&2 | |||
skipping to change at line 521 | skipping to change at line 534 | |||
# Runtime isn't EOL at time of app uninstall, so it's left alone | # Runtime isn't EOL at time of app uninstall, so it's left alone | |||
${FLATPAK} ${U} uninstall -y org.test.Hello >&2 | ${FLATPAK} ${U} uninstall -y org.test.Hello >&2 | |||
assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | |||
EXPORT_ARGS="--end-of-life=Reason4" make_updated_runtime | EXPORT_ARGS="--end-of-life=Reason4" make_updated_runtime | |||
${FLATPAK} ${U} update -y org.test.Platform >&2 | ${FLATPAK} ${U} update -y org.test.Platform >&2 | |||
${FLATPAK} ${U} info org.test.Platform > info-log | ${FLATPAK} ${U} info org.test.Platform > info-log | |||
assert_file_has_content info-log "End-of-life: Reason4" | assert_file_has_content info-log "End-of-life: Reason4" | |||
# Now that the runtime is EOL and unused it should be uninstalled by the update | # Now that the runtime is EOL and unused it should be uninstalled by the | |||
command | # update command. Check first that it's not uninstalled with --no-deploy. | |||
${FLATPAK} ${U} update -y --no-deploy >&2 | ||||
assert_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | ||||
${FLATPAK} ${U} update -y >&2 | ${FLATPAK} ${U} update -y >&2 | |||
assert_not_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | assert_not_has_dir $FL_DIR/runtime/org.test.Platform/$ARCH/master/active/files | |||
# Revert things for future tests | # Revert things for future tests | |||
EXPORT_ARGS="" make_updated_runtime | EXPORT_ARGS="" make_updated_runtime | |||
${FLATPAK} ${U} uninstall -y --all >&2 | ${FLATPAK} ${U} uninstall -y --all >&2 | |||
ok "eol runtime uninstalled during update run" | ok "eol runtime uninstalled during update run" | |||
${FLATPAK} ${U} install -y test-repo org.test.Platform >&2 | ${FLATPAK} ${U} install -y test-repo org.test.Platform >&2 | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 18 lines changed or added |