Merge pull request #233 from benfitzpatrick/svn19

fcm test-battery: cm: adjust for Subversion 1.9 compatibility
metomi · Sep 19, 2016 · bfb3895 · bfb3895
2 parents dcc7148 + f29f9bf
commit bfb3895
Show file tree

Hide file tree

Showing 27 changed files with 751 additions and 1,711 deletions.
diff --git a/t/fcm-add/test_header b/t/fcm-add/test_header
diff --git a/t/fcm-add/test_header b/t/fcm-add/test_header
@@ -0,0 +1 @@
+../lib/bash/svn_test_header
diff --git a/t/fcm-branch-create/00-simple.t b/t/fcm-branch-create/00-simple.t
@@ -34,6 +34,7 @@ TEST_KEY=$TEST_KEY_BASE-fcm-bc
 run_pass "$TEST_KEY" fcm branch-create -t SHARE --rev-flag=NONE \
                                         --non-interactive \
                                         my_branch_test
+branch_tidy "$TEST_KEY.out"
 file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] Source: $ROOT_URL/trunk@1 (4)
 Change summary:
@@ -44,7 +45,6 @@ Commit message is as follows:
 --------------------------------------------------------------------------------
 Created /${PROJECT}branches/dev/Share/my_branch_test from /${PROJECT}trunk@1.
 --------------------------------------------------------------------------------
-
 Committed revision 5.
 [info] Created: $ROOT_URL/branches/dev/Share/my_branch_test
 __OUT__
@@ -69,6 +69,7 @@ TEST_KEY=$TEST_KEY_BASE-fcm-bc-branch-of-branch
 run_pass "$TEST_KEY" fcm branch-create -t SHARE --rev-flag=NONE \
                                        --non-interactive \
                                        --branch-of-branch my_branch_test
+branch_tidy "$TEST_KEY.out"
 file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] Source: $ROOT_URL/branches/dev/Share/branch_test@4 (4)
 Change summary:
@@ -79,7 +80,6 @@ Commit message is as follows:
 --------------------------------------------------------------------------------
 Created /${PROJECT}branches/dev/Share/my_branch_test from /${PROJECT}branches/dev/Share/branch_test@4.
 --------------------------------------------------------------------------------
-
 Committed revision 5.
 [info] Created: $ROOT_URL/branches/dev/Share/my_branch_test
 __OUT__