From 15096ac49e3c387ba9050ba1d611e99375d4f98a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 26 May 2017 10:52:26 -0400 Subject: [PATCH] tests: Add 404 tests for dirtree objects too I now believe the flatpak issue we were hitting was https://github.com/ostreedev/ostree/pull/1185 but let's add these tests anyways for more coverage. Closes: #888 Approved by: jlebon --- tests/pull-test.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/pull-test.sh b/tests/pull-test.sh index f2c45f93..7d4b57f9 100644 --- a/tests/pull-test.sh +++ b/tests/pull-test.sh @@ -35,7 +35,7 @@ function verify_initial_contents() { assert_file_has_content baz/cow '^moo$' } -echo "1..30" +echo "1..31" # Try both syntaxes repo_init --no-gpg-verify @@ -476,6 +476,16 @@ fi assert_file_has_content err.txt "GPG verification enabled, but no signatures found" echo "ok pull repo 404 (gpg)" +cd ${test_tmpdir} +find ostree-srv/gnomerepo/objects -name '*.dirtree' | while read f; do mv ${f}{,.orig}; done +repo_init --set=gpg-verify=false +if ${CMD_PREFIX} ostree --repo=repo --depth=0 pull origin main 2>err.txt; then + assert_not_reached "pull repo 404 succeeded?" +fi +assert_file_has_content err.txt "404" +find ostree-srv/gnomerepo/objects -name '*.dirtree.orig' | while read f; do mv ${f} $(dirname $f)/$(basename ${f} .orig); done +echo "ok pull repo 404 on dirtree object" + cd ${test_tmpdir} repo_init --set=gpg-verify=true ${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo commit \