From e0d3fbfdf1fa421800051c265e1f4f2f9d2466cb Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Tue, 8 Aug 2017 15:26:59 +0200 Subject: t1300: Fix test cases for non-fast-forward pushes Since commit c5302d3 (Require TUs to explicitly request to overwrite a pkgbase, 2017-07-24), non-fast-forward pushes are denied even for Trusted Users, unless the AUR_OVERWRITE environment variable is set. Mark the test case performing a non-fast-forward push from a TU account as test_must_fail and add another test case performing the same operation with AUR_OVERWRITE=1. Signed-off-by: Lukas Fleischer --- test/t1300-git-update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/t1300-git-update.sh b/test/t1300-git-update.sh index f16e2ad4..109351a9 100755 --- a/test/t1300-git-update.sh +++ b/test/t1300-git-update.sh @@ -125,7 +125,18 @@ test_expect_success 'Performing a non-fast-forward ref update.' ' test_expect_success 'Performing a non-fast-forward ref update as Trusted User.' ' old=$(git -C aur.git rev-parse HEAD) && new=$(git -C aur.git rev-parse HEAD^) && + cat >expected <<-EOD && + error: denying non-fast-forward (you should pull first) + EOD AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 \ + test_must_fail "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 && + test_cmp expected actual +' + +test_expect_success 'Performing a non-fast-forward ref update with AUR_OVERWRITE=1.' ' + old=$(git -C aur.git rev-parse HEAD) && + new=$(git -C aur.git rev-parse HEAD^) && + AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 AUR_OVERWRITE=1 \ "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 ' -- cgit v1.2.3-24-g4f1b