t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail

drafnel · gitster · commit 77b5be2abab6 · 2010-07-20T11:37:45.000-07:00
The '!()' notation is interpreted as a pattern-list on Ksh.  The Ksh man
page describe it as follows:

   !(pattern-list)
      Matches anything except one of the given patterns.

Ksh performs a file glob using the pattern-list and then tries to execute
the first file in the list.  If a space is added between the '!' and the
open parens, then Ksh will not interpret it as a pattern list, but in this
case, it is preferred to use test_must_fail, so lets do so.

Signed-off-by: Brandon Casey &lt;casey@nrlssc.navy.mil&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
@@ -145,7 +145,7 @@ test_http_push_nonff() {
 		echo "changed" > path2 &&
 		git commit -a -m path2 --amend &&
 
-		!(git push -v origin >output 2>&1) &&
+		test_must_fail git push -v origin >output 2>&1 &&
 		(cd "$REMOTE_REPO" &&
 		 test $HEAD = $(git rev-parse --verify HEAD))
 	'
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
@@ -128,7 +128,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
 
 	# push master too; this ensures there is at least one '"'push'"' command to
 	# the remote helper and triggers interaction with the helper.
-	!(git push -v origin +master master:retsam >output 2>&1) &&
+	test_must_fail git push -v origin +master master:retsam >output 2>&1 &&
 
 	grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
 	grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output &&

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ test_http_push_nonff() {`
`145`	`145`	`echo "changed" > path2 &&`
`146`	`146`	`git commit -a -m path2 --amend &&`
`147`	`147`
`148`		`- !(git push -v origin >output 2>&1) &&`
	`148`	`+ test_must_fail git push -v origin >output 2>&1 &&`
`149`	`149`	`(cd "$REMOTE_REPO" &&`
`150`	`150`	`test $HEAD = $(git rev-parse --verify HEAD))`
`151`	`151`	`'`