diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2019-03-26 17:02:36 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-03-30 13:02:10 +0000 |
| commit | 3d74d4b37fee1e381bcf8ef6abc25a495cbc4ea2 (patch) | |
| tree | 22838a25eef30924ee268fa0bea2fada99053a9d /tests/test-repo.sh | |
| parent | 1ce532dad79ae9f4dd7ca907cd8d11a0f26a46e4 (diff) | |
| download | flatpak-3d74d4b37fee1e381bcf8ef6abc25a495cbc4ea2.tar.gz | |
tests: Add ability to test a branch other than master
This commit makes it so that a unit test can create the test app and
runtime using a branch other than master, and changes test-run.sh to use
the branch "stable". This will allow the run command to be tested better
in the following commit.
Closes: #2788
Approved by: matthiasclasen
Diffstat (limited to 'tests/test-repo.sh')
| -rwxr-xr-x | tests/test-repo.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-repo.sh b/tests/test-repo.sh index d0ae00d3..d28fd979 100755 --- a/tests/test-repo.sh +++ b/tests/test-repo.sh @@ -274,7 +274,7 @@ ${FLATPAK} ${U} install -y test-repo org.test.Platform port=$(cat httpd-port-main) UPDATE_REPO_ARGS="--redirect-url=http://127.0.0.1:${port}/test-gpg3 --gpg-import=${FL_GPG_HOMEDIR2}/pubring.gpg" update_repo -GPGPUBKEY="${FL_GPG_HOMEDIR2}/pubring.gpg" GPGARGS="${FL_GPGARGS2}" setup_repo_no_add test-gpg3 org.test.Collection.test +GPGPUBKEY="${FL_GPG_HOMEDIR2}/pubring.gpg" GPGARGS="${FL_GPGARGS2}" setup_repo_no_add test-gpg3 org.test.Collection.test master ${FLATPAK} ${U} update -y org.test.Platform # Ensure we have the new uri @@ -282,7 +282,7 @@ ${FLATPAK} ${U} remotes -d | grep ^test-repo > repo-info assert_file_has_content repo-info "/test-gpg3" # Make sure we also get new installs from the new repo -GPGARGS="${FL_GPGARGS2}" make_updated_app test-gpg3 org.test.Collection.test +GPGARGS="${FL_GPGARGS2}" make_updated_app test-gpg3 org.test.Collection.test master update_repo test-gpg3 org.test.Collection.test ${FLATPAK} ${U} install -y test-repo org.test.Hello |