cvsexportcommit: reorder tests to quiet intermittent failure
Reorder tests introduced in fef3a7cc and 54d5cc0e so an intermittent but unimportant failure on the CVS side related to the former does not interfere with what is actually being tested. Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Tested-by: Tommy Nordgren <tommy.nordgren@comhem.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mike Ralphson committed
Jul 15, 2009 at 15:34 UTC
3de4a44308d5c84c468f3fb69a3c3f3092eaf369
1 file changed
+22
-19
t/t9200-git-cvsexportcommit.sh
+22
-19
@@ -288,6 +288,27 @@ test_expect_success 'check files before directories' '
288
289
'
290
291
+test_expect_success 're-commit a removed filename which remains in CVS attic' '
292
+
293
+ (cd "$CVSWORK" &&
294
+ echo >attic_gremlin &&
295
+ cvs -Q add attic_gremlin &&
296
+ cvs -Q ci -m "added attic_gremlin" &&
297
+ rm attic_gremlin &&
298
+ cvs -Q rm attic_gremlin &&
299
+ cvs -Q ci -m "removed attic_gremlin") &&
300
+
301
+ echo > attic_gremlin &&
302
+ git add attic_gremlin &&
303
+ git commit -m "Added attic_gremlin" &&
304
+ git cvsexportcommit -w "$CVSWORK" -c HEAD &&
305
+ (cd "$CVSWORK"; cvs -Q update -d) &&
306
+ test -f "$CVSWORK/attic_gremlin"
307
+'
308
+
309
+# the state of the CVS sandbox may be indeterminate for ' space'
310
+# after this test on some platforms / with some versions of CVS
311
+# consider adding new tests above this point
312
test_expect_success 'commit a file with leading spaces in the name' '
313
314
echo space > " space" &&
@@ -295,7 +316,7 @@ test_expect_success 'commit a file with leading spaces in the name' '
316
git commit -m "Add a file with a leading space" &&
317
id=$(git rev-parse HEAD) &&
318
git cvsexportcommit -w "$CVSWORK" -c $id &&
298
- check_entries "$CVSWORK" " space/1.1/|DS/1.1/|release-notes/1.2/" &&
319
+ check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" &&
320
test_cmp "$CVSWORK/ space" " space"
321
322
'
@@ -317,22 +338,4 @@ test_expect_success 'use the same checkout for Git and CVS' '
338
339
'
340
320
-test_expect_success 're-commit a removed filename which remains in CVS attic' '
321
-
322
- (cd "$CVSWORK" &&
323
- echo >attic_gremlin &&
324
- cvs -Q add attic_gremlin &&
325
- cvs -Q ci -m "added attic_gremlin" &&
326
- rm attic_gremlin &&
327
- cvs -Q rm attic_gremlin &&
328
- cvs -Q ci -m "removed attic_gremlin") &&
329
-
330
- echo > attic_gremlin &&
331
- git add attic_gremlin &&
332
- git commit -m "Added attic_gremlin" &&
333
- git cvsexportcommit -w "$CVSWORK" -c HEAD &&
334
- (cd "$CVSWORK"; cvs -Q update -d) &&
335
- test -f "$CVSWORK/attic_gremlin"
336
-'
337
-
341
test_done