From 582c1b5708735a057a33be78e447f891faff3369 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 21 Jun 2018 11:08:06 +0200 Subject: [PATCH] Fix tests with new flatpak --- tests/libtest.sh | 10 +++++----- tests/test-builder.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/libtest.sh b/tests/libtest.sh index 5b455582..7f27e1b0 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -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 () { diff --git a/tests/test-builder.sh b/tests/test-builder.sh index 396fc183..efdf3702 100755 --- a/tests/test-builder.sh +++ b/tests/test-builder.sh @@ -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