From 6af8db6fc47ba7e98d1c5d14b0ddf3a9e3fa54e9 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Mon, 17 Oct 2016 22:53:32 +0200 Subject: [PATCH] tests: Add test for the cookie jar handling Closes: #531 Approved by: cgwalters --- Makefile-tests.am | 1 + tests/test-remote-cookies.sh | 68 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100755 tests/test-remote-cookies.sh diff --git a/Makefile-tests.am b/Makefile-tests.am index 55381234..6c2301ce 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -45,6 +45,7 @@ dist_test_scripts = \ tests/test-pull-subpath.sh \ tests/test-archivez.sh \ tests/test-remote-add.sh \ + tests/test-remote-cookies.sh \ tests/test-remote-gpg-import.sh \ tests/test-commit-sign.sh \ tests/test-export.sh \ diff --git a/tests/test-remote-cookies.sh b/tests/test-remote-cookies.sh new file mode 100755 index 00000000..11c201f1 --- /dev/null +++ b/tests/test-remote-cookies.sh @@ -0,0 +1,68 @@ +#!/bin/bash +# +# Copyright (C) 2013 Jeremy Whiting +# Copyright (C) 2016 Sjoerd Simons +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +set -euo pipefail + +echo '1..4' + +. $(dirname $0)/libtest.sh + +setup_fake_remote_repo1 "archive-z2" "" \ + "--expected-cookies foo=bar --expected-cookies baz=badger" + +assert_fail (){ + set +e + $@ + if [ $? = 0 ] ; then + echo 1>&2 "$@ did not fail"; exit 1 + fi + set -euo pipefail +} + +cd ${test_tmpdir} +rm repo -rf +mkdir repo +${CMD_PREFIX} ostree --repo=repo init +${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo + +# Sanity check the setup, without cookies the pull should fail +assert_fail ${CMD_PREFIX} ostree --repo=repo pull origin main + +echo "ok, setup done" + +# Add 2 cookies, pull should succeed now +${CMD_PREFIX} ostree --repo=repo remote add-cookie origin 127.0.0.1 / foo bar +${CMD_PREFIX} ostree --repo=repo remote add-cookie origin 127.0.0.1 / baz badger +${CMD_PREFIX} ostree --repo=repo pull origin main + +echo "ok, initial cookie pull succeeded" + +# Delete one cookie, if successful pulls will fail again +${CMD_PREFIX} ostree --repo=repo remote delete-cookie origin 127.0.0.1 / baz badger +assert_fail ${CMD_PREFIX} ostree --repo=repo pull origin main + +echo "ok, delete succeeded" + +# Re-add the removed cooking and things succeed again, verified the removal +# removed exactly one cookie +${CMD_PREFIX} ostree --repo=repo remote add-cookie origin 127.0.0.1 / baz badger +${CMD_PREFIX} ostree --repo=repo pull origin main + +echo "ok, second cookie pull succeeded"