git-svn: fix 'info' tests for unknown items
The previous tests all expected the results from SVN and Git to be identical, and expected both to return success. This cannot be guaranteed: SVN changed the message style between 1.4 and 1.5, and in 1.5, sets a failure exit code. Change the tests to verify that 'git svn info <item>' sets a failure exit code, and that its output contains the file name. This should hopefully catch all other errors. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Eric Wong <normalperson@yhbt.net>
Thomas Rast committed
Aug 29, 2008 at 15:42 UTC
4457d4f767f0744e7936be449c3d25c507b7591a
1 file changed
+25
-48
t/t9119-git-svn-info.sh
+25
-48
@@ -319,82 +319,59 @@ test_expect_success 'info --url symlink-directory (deleted)' '
319
320
test_expect_success 'info unknown-file' "
321
echo two > gitwc/unknown-file &&
322
- cp gitwc/unknown-file svnwc/unknown-file &&
323
- ptouch gitwc/unknown-file svnwc/unknown-file &&
324
- (cd svnwc; svn info unknown-file) 2> expected.info-unknown-file &&
325
- (cd gitwc; git-svn info unknown-file) 2> actual.info-unknown-file &&
326
- test_cmp expected.info-unknown-file actual.info-unknown-file
322
+ (cd gitwc; test_must_fail git-svn info unknown-file) \
323
+ 2> actual.info-unknown-file &&
324
+ grep unknown-file actual.info-unknown-file
325
"
326
327
test_expect_success 'info --url unknown-file' '
330
- test -z "$(cd gitwc; git-svn info --url unknown-file \
331
- 2> ../actual.info--url-unknown-file)" &&
332
- test_cmp expected.info-unknown-file actual.info--url-unknown-file
328
+ echo two > gitwc/unknown-file &&
329
+ (cd gitwc; test_must_fail git-svn info --url unknown-file) \
330
+ 2> actual.info-url-unknown-file &&
331
+ grep unknown-file actual.info-url-unknown-file
332
'
333
334
test_expect_success 'info unknown-directory' "
335
mkdir gitwc/unknown-directory svnwc/unknown-directory &&
337
- ptouch gitwc/unknown-directory svnwc/unknown-directory &&
338
- touch gitwc/unknown-directory/.placeholder &&
339
- (cd svnwc; svn info unknown-directory) \
340
- 2> expected.info-unknown-directory &&
341
- (cd gitwc; git-svn info unknown-directory) \
342
- 2> actual.info-unknown-directory &&
343
- test_cmp expected.info-unknown-directory actual.info-unknown-directory
336
+ (cd gitwc; test_must_fail git-svn info unknown-directory) \
337
+ 2> actual.info-unknown-directory &&
338
+ grep unknown-directory actual.info-unknown-directory
339
"
340
341
test_expect_success 'info --url unknown-directory' '
347
- test -z "$(cd gitwc; git-svn info --url unknown-directory \
348
- 2> ../actual.info--url-unknown-directory)" &&
349
- test_cmp expected.info-unknown-directory \
350
- actual.info--url-unknown-directory
342
+ (cd gitwc; test_must_fail git-svn info --url unknown-directory) \
343
+ 2> actual.info-url-unknown-directory &&
344
+ grep unknown-directory actual.info-url-unknown-directory
345
'
346
347
test_expect_success 'info unknown-symlink-file' "
348
cd gitwc &&
349
ln -s unknown-file unknown-symlink-file &&
350
cd .. &&
357
- cd svnwc &&
358
- ln -s unknown-file unknown-symlink-file &&
359
- cd .. &&
360
- ptouch gitwc/unknown-symlink-file svnwc/unknown-symlink-file &&
361
- (cd svnwc; svn info unknown-symlink-file) \
362
- 2> expected.info-unknown-symlink-file &&
363
- (cd gitwc; git-svn info unknown-symlink-file) \
364
- 2> actual.info-unknown-symlink-file &&
365
- test_cmp expected.info-unknown-symlink-file \
366
- actual.info-unknown-symlink-file
351
+ (cd gitwc; test_must_fail git-svn info unknown-symlink-file) \
352
+ 2> actual.info-unknown-symlink-file &&
353
+ grep unknown-symlink-file actual.info-unknown-symlink-file
354
"
355
356
test_expect_success 'info --url unknown-symlink-file' '
370
- test -z "$(cd gitwc; git-svn info --url unknown-symlink-file \
371
- 2> ../actual.info--url-unknown-symlink-file)" &&
372
- test_cmp expected.info-unknown-symlink-file \
373
- actual.info--url-unknown-symlink-file
357
+ (cd gitwc; test_must_fail git-svn info --url unknown-symlink-file) \
358
+ 2> actual.info-url-unknown-symlink-file &&
359
+ grep unknown-symlink-file actual.info-url-unknown-symlink-file
360
'
361
362
test_expect_success 'info unknown-symlink-directory' "
363
cd gitwc &&
364
ln -s unknown-directory unknown-symlink-directory &&
365
cd .. &&
380
- cd svnwc &&
381
- ln -s unknown-directory unknown-symlink-directory &&
382
- cd .. &&
383
- ptouch gitwc/unknown-symlink-directory \
384
- svnwc/unknown-symlink-directory &&
385
- (cd svnwc; svn info unknown-symlink-directory) \
386
- 2> expected.info-unknown-symlink-directory &&
387
- (cd gitwc; git-svn info unknown-symlink-directory) \
388
- 2> actual.info-unknown-symlink-directory &&
389
- test_cmp expected.info-unknown-symlink-directory \
390
- actual.info-unknown-symlink-directory
366
+ (cd gitwc; test_must_fail git-svn info unknown-symlink-directory) \
367
+ 2> actual.info-unknown-symlink-directory &&
368
+ grep unknown-symlink-directory actual.info-unknown-symlink-directory
369
"
370
371
test_expect_success 'info --url unknown-symlink-directory' '
394
- test -z "$(cd gitwc; git-svn info --url unknown-symlink-directory \
395
- 2> ../actual.info--url-unknown-symlink-directory)" &&
396
- test_cmp expected.info-unknown-symlink-directory \
397
- actual.info--url-unknown-symlink-directory
372
+ (cd gitwc; test_must_fail git-svn info --url unknown-symlink-directory) \
373
+ 2> actual.info-url-unknown-symlink-directory &&
374
+ grep unknown-symlink-directory actual.info-url-unknown-symlink-directory
375
'
376
377
test_done