From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 2/2] detached-stash: fix broken test_must_fail calls
Date: Wed, 1 Sep 2010 00:49:20 +1000 [thread overview]
Message-ID: <1283266160-11665-3-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1283266160-11665-1-git-send-email-jon.seymour@gmail.com>
Some tests in detached-stash are calling test_must_fail
in such a way that the arguments to test_must_fail do, indeed, fail
but not in the manner expected by the test.
This patch removes the unnecessary and unhelpful double quotes.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t3903-stash.sh | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index ea9f979..d99f27a 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -435,7 +435,7 @@ test_expect_success 'stash drop - fail early if specified stash is not a stash r
git stash &&
echo bar > file &&
git stash &&
- test_must_fail "git stash drop $(git rev-parse stash@{0})" &&
+ test_must_fail git stash drop $(git rev-parse stash@{0}) &&
git stash pop &&
test bar = "$(cat file)" &&
git reset --hard HEAD
@@ -449,7 +449,7 @@ test_expect_success 'stash pop - fail early if specified stash is not a stash re
git stash &&
echo bar > file &&
git stash &&
- test_must_fail "git stash pop $(git rev-parse stash@{0})" &&
+ test_must_fail git stash pop $(git rev-parse stash@{0}) &&
git stash pop &&
test bar = "$(cat file)" &&
git reset --hard HEAD
@@ -462,31 +462,31 @@ test_expect_success 'ref with non-existant reflog' '
git add file2 &&
git stash &&
! "git rev-parse --quiet --verify does-not-exist" &&
- test_must_fail "git stash drop does-not-exist" &&
- test_must_fail "git stash drop does-not-exist@{0}" &&
- test_must_fail "git stash pop does-not-exist" &&
- test_must_fail "git stash pop does-not-exist@{0}" &&
- test_must_fail "git stash apply does-not-exist" &&
- test_must_fail "git stash apply does-not-exist@{0}" &&
- test_must_fail "git stash show does-not-exist" &&
- test_must_fail "git stash show does-not-exist@{0}" &&
- test_must_fail "git stash branch tmp does-not-exist" &&
- test_must_fail "git stash branch tmp does-not-exist@{0}" &&
+ test_must_fail git stash drop does-not-exist &&
+ test_must_fail git stash drop does-not-exist@{0} &&
+ test_must_fail git stash pop does-not-exist &&
+ test_must_fail git stash pop does-not-exist@{0} &&
+ test_must_fail git stash apply does-not-exist &&
+ test_must_fail git stash apply does-not-exist@{0} &&
+ test_must_fail git stash show does-not-exist &&
+ test_must_fail git stash show does-not-exist@{0} &&
+ test_must_fail git stash branch tmp does-not-exist &&
+ test_must_fail git stash branch tmp does-not-exist@{0} &&
git stash drop
'
test_expect_success 'invalid ref of the form stash@{n}, n >= N' '
git stash clear &&
- test_must_fail "git stash drop stash@{0}" &&
+ test_must_fail git stash drop stash@{0} &&
echo bar5 > file &&
echo bar6 > file2 &&
git add file2 &&
git stash &&
- test_must_fail "git drop stash@{1}" &&
- test_must_fail "git pop stash@{1}" &&
- test_must_fail "git apply stash@{1}" &&
- test_must_fail "git show stash@{1}" &&
- test_must_fail "git branch tmp stash@{1}" &&
+ test_must_fail git drop stash@{1} &&
+ test_must_fail git pop stash@{1} &&
+ test_must_fail git apply stash@{1} &&
+ test_must_fail git show stash@{1} &&
+ test_must_fail git branch tmp stash@{1} &&
git stash drop
'
--
1.7.2.80.g22196.dirty
next prev parent reply other threads:[~2010-08-31 14:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-31 14:49 [PATCH 0/2] fix quotes in maint-reflog-beyond-horizon and detached-stash Jon Seymour
2010-08-31 14:49 ` [PATCH 1/2] maint-reflog-beyond-horizon: fix broken test_must_fail calls Jon Seymour
2010-08-31 14:49 ` Jon Seymour [this message]
2010-08-31 15:54 ` [PATCH 0/2] fix quotes in maint-reflog-beyond-horizon and detached-stash Jeff King
2010-08-31 15:56 ` [PATCH 1/2] tests: make test_must_fail more verbose Jeff King
2010-08-31 17:10 ` Jonathan Nieder
2010-08-31 18:06 ` Jeff King
2010-08-31 19:35 ` Jonathan Nieder
2010-09-01 3:37 ` Jon Seymour
2010-09-01 10:55 ` Ævar Arnfjörð Bjarmason
2010-08-31 15:56 ` [PATCH 2/2] tests: make test_must_fail fail on missing commands Jeff King
2010-08-31 16:58 ` Junio C Hamano
2010-08-31 17:25 ` Jeff King
2010-08-31 17:26 ` Jonathan Nieder
2010-08-31 18:08 ` Jeff King
2010-08-31 18:14 ` Ævar Arnfjörð Bjarmason
2010-08-31 17:03 ` [PATCH 0/2] fix quotes in maint-reflog-beyond-horizon and detached-stash Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283266160-11665-3-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).