t9158, t9161: fix broken &&-chain in git-svn tests
All of these cases are moderate since they would most probably not lead to missed failing tests; either they would fail otherwise, or fail a rm in test_when_finished only. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Mar 20, 2015 at 15:32 UTC
49383dd431b5897652708ed05da305d639bdb8cc
2 files changed
+7
-7
t/t9158-git-svn-mergeinfo.sh
+2
-2
@@ -34,7 +34,7 @@ test_expect_success 'change svn:mergeinfo' '
34
'
35
36
test_expect_success 'verify svn:mergeinfo' '
37
- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
37
+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
38
test "$mergeinfo" = "/branches/foo:1-10"
39
'
40
@@ -46,7 +46,7 @@ test_expect_success 'change svn:mergeinfo multiline' '
46
'
47
48
test_expect_success 'verify svn:mergeinfo multiline' '
49
- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
49
+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
50
test "$mergeinfo" = "/branches/bar:1-10
51
/branches/other:3-5,8,10-11"
52
'
t/t9161-git-svn-mergeinfo-push.sh
+5
-5
@@ -24,7 +24,7 @@ test_expect_success 'propagate merge information' '
24
'
25
26
test_expect_success 'check svn:mergeinfo' '
27
- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
27
+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
28
test "$mergeinfo" = "/branches/svnb2:3,8"
29
'
30
@@ -34,7 +34,7 @@ test_expect_success 'merge another branch' '
34
'
35
36
test_expect_success 'check primary parent mergeinfo respected' '
37
- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
37
+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
38
test "$mergeinfo" = "/branches/svnb2:3,8
39
/branches/svnb3:4,9"
40
'
@@ -45,7 +45,7 @@ test_expect_success 'merge existing merge' '
45
'
46
47
test_expect_success "check both parents' mergeinfo respected" '
48
- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
48
+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
49
test "$mergeinfo" = "/branches/svnb2:3,8
50
/branches/svnb3:4,9
51
/branches/svnb4:5-6,10-12
@@ -70,7 +70,7 @@ test_expect_success 'second forward merge' '
70
'
71
72
test_expect_success 'check new mergeinfo added' '
73
- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
73
+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
74
test "$mergeinfo" = "/branches/svnb2:3,8,16-17
75
/branches/svnb3:4,9
76
/branches/svnb4:5-6,10-12
@@ -84,7 +84,7 @@ test_expect_success 'reintegration merge' '
84
'
85
86
test_expect_success 'check reintegration mergeinfo' '
87
- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
87
+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) &&
88
test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
89
/branches/svnb2:3,8,16-17
90
/branches/svnb3:4,9