t9402: Dont use test_must_fail cvs
Replace "test_must_fail cvs" with "! cvs" Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Torsten Bögershausen committed
Dec 8, 2012 at 22:34 UTC
341bf11245463a59dc20060f3157386b6d4aa7e4
1 file changed
+10
-10
t/t9402-git-cvsserver-refs.sh
+10
-10
@@ -156,7 +156,7 @@ test_expect_success 'edit cvswork3 and save diff' '
156
rm t2 &&
157
cvs -f add adir/afile5 &&
158
cvs -f rm t2 &&
159
- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
159
+ ! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
160
)
161
'
162
@@ -281,7 +281,7 @@ test_expect_success 'cvs co b2 [into cvswork2]' '
281
test_expect_success 'root dir edit [cvswork2]' '
282
( cd cvswork2 &&
283
echo "Line 2" >> textfile.c &&
284
- test_must_fail cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
284
+ ! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
285
cvs -f commit -m "edit textfile.c" textfile.c
286
) >cvsEdit1.log 2>&1
287
'
@@ -290,7 +290,7 @@ test_expect_success 'root dir rm file [cvswork2]' '
290
( cd cvswork2 &&
291
cvs -f rm -f t2 &&
292
cvs -f diff -u > ../cvsEdit2-empty.diff &&
293
- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
293
+ ! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
294
cvs -f commit -m "rm t2"
295
) > cvsEdit2.log 2>&1
296
'
@@ -304,11 +304,11 @@ test_expect_success 'subdir edit/add/rm files [cvswork2' '
304
cvs -f rm bdir/b2file &&
305
echo "4th file" > bdir/b4file &&
306
cvs -f add bdir/b4file &&
307
- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
307
+ ! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
308
git fetch gitcvs.git b2:b2 &&
309
( cd .. &&
310
- test_must_fail cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
311
- test_must_fail cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
310
+ ! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
311
+ ! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
312
) &&
313
cvs -f commit -m "various add/rm/edit"
314
) >cvs.log 2>&1
@@ -468,7 +468,7 @@ test_expect_success 'cvs diff -r v1 -u' '
468
469
test_expect_success 'cvs diff -N -r v2 -u' '
470
( cd cvswork &&
471
- test_must_fail cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
471
+ ! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
472
test ! -s cvs.log &&
473
test -s cvsDiff.out &&
474
check_diff cvsDiff.out v2 v1 > check_diff.out 2>&1
@@ -476,7 +476,7 @@ test_expect_success 'cvs diff -N -r v2 -u' '
476
477
test_expect_success 'cvs diff -N -r v2 -r v1.2' '
478
( cd cvswork &&
479
- test_must_fail cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
479
+ ! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
480
test ! -s cvs.log &&
481
test -s cvsDiff.out &&
482
check_diff cvsDiff.out v2 v1.2 > check_diff.out 2>&1
@@ -494,7 +494,7 @@ test_expect_success 'apply early [cvswork3] diff to b3' '
494
495
test_expect_success 'check [cvswork3] diff' '
496
( cd cvswork3 &&
497
- test_must_fail cvs -f diff -N -u ) >"$WORKDIR/cvsDiff.out" 2>cvs.log &&
497
+ ! cvs -f diff -N -u ) >"$WORKDIR/cvsDiff.out" 2>cvs.log &&
498
test ! -s cvs.log &&
499
test -s cvsDiff.out &&
500
test $(grep Index: cvsDiff.out | wc -l) = 3 &&
@@ -517,7 +517,7 @@ test_expect_success 'merge early [cvswork3] b3 with b1' '
517
test_expect_success 'cvs up dirty [cvswork3]' '
518
( cd cvswork3 &&
519
cvs -f up &&
520
- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" ) >cvs.log 2>&1 &&
520
+ ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" ) >cvs.log 2>&1 &&
521
test -s cvsDiff.out &&
522
test $(grep Index: cvsDiff.out | wc -l) = 2
523
check_start_tree cvswork3 &&