Fix tests with new flatpak

auto
Alexander Larsson 2018-06-21 11:08:06 +02:00
parent 6d9f874c12
commit 582c1b5708
2 changed files with 7 additions and 7 deletions

View File

@ -267,19 +267,19 @@ setup_python2_repo () {
install_repo () {
REPONAME=${1:-test}
${FLATPAK} ${U} install ${REPONAME}-repo org.test.Platform master
${FLATPAK} ${U} install ${REPONAME}-repo org.test.Hello master
${FLATPAK} ${U} install -y ${REPONAME}-repo org.test.Platform master
${FLATPAK} ${U} install -y ${REPONAME}-repo org.test.Hello master
}
install_sdk_repo () {
REPONAME=${1:-test}
${FLATPAK} ${U} install ${REPONAME}-repo org.test.Sdk master
${FLATPAK} ${U} install -y ${REPONAME}-repo org.test.Sdk master
}
install_python2_repo () {
REPONAME=${1:-test}
${FLATPAK} ${U} install ${REPONAME}-repo org.test.PythonPlatform master
${FLATPAK} ${U} install ${REPONAME}-repo org.test.PythonSdk master
${FLATPAK} ${U} install -y ${REPONAME}-repo org.test.PythonPlatform master
${FLATPAK} ${U} install -y ${REPONAME}-repo org.test.PythonSdk master
}
run () {

View File

@ -73,7 +73,7 @@ assert_file_has_content hello_out2 '^Hello world2, from a sandbox$'
echo "ok build"
${FLATPAK} ${U} install test-repo org.test.Hello2 master
${FLATPAK} ${U} install -y test-repo org.test.Hello2 master
run org.test.Hello2 > hello_out3
assert_file_has_content hello_out3 '^Hello world2, from a sandbox$'
@ -88,7 +88,7 @@ assert_file_has_content appdir/files/share/app-data version2
${FLATPAK_BUILDER} $FL_GPGARGS --repo=$REPO --force-clean appdir test.yaml
assert_file_has_content appdir/files/share/app-data version2
${FLATPAK} ${U} update org.test.Hello2 master
${FLATPAK} ${U} update -y org.test.Hello2 master
run --command=cat org.test.Hello2 /app/share/app-data > app_data_2
assert_file_has_content app_data_2 version2