t9118: workaround inconsistency between SVN versions

schwern · Eric Wong · commit dad9090f89b8 · 2012-08-02T21:45:58.000Z
SVN 1.7 will truncate "not-a%40{0}" to just "not-a".

Rather than guess what SVN is going to do for each version, make the test use
the branch name that was actually created.

[ew: commit title]

Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
@@ -32,6 +32,11 @@ test_expect_success 'setup svnrepo' '
 	start_httpd
 	'
 
+# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
+# Look at what SVN wound up naming the branch and use that.
+# Be sure to escape the @ if it shows up.
+non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/'`
+
 test_expect_success 'test clone with funky branch names' '
 	git svn clone -s "$svnrepo/pr ject" project &&
 	(
@@ -42,7 +47,7 @@ test_expect_success 'test clone with funky branch names' '
 		git rev-parse "refs/remotes/%2Eleading_dot" &&
 		git rev-parse "refs/remotes/trailing_dot%2E" &&
 		git rev-parse "refs/remotes/trailing_dotlock%2Elock" &&
-		git rev-parse "refs/remotes/not-a%40{0}reflog"
+		git rev-parse "refs/remotes/$non_reflog"
 	)
 	'
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ test_expect_success 'setup svnrepo' '`
`32`	`32`	`start_httpd`
`33`	`33`	`'`
`34`	`34`
	`35`	`+# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".`
	`36`	`+# Look at what SVN wound up naming the branch and use that.`
	`37`	`+# Be sure to escape the @ if it shows up.`
	`38`	+non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" \| grep not-a \| sed 's/\///' \| sed 's/@/%40/'`
	`39`	`+`
`35`	`40`	`test_expect_success 'test clone with funky branch names' '`
`36`	`41`	`git svn clone -s "$svnrepo/pr ject" project &&`
`37`	`42`	`(`
`@@ -42,7 +47,7 @@ test_expect_success 'test clone with funky branch names' '`
`42`	`47`	`git rev-parse "refs/remotes/%2Eleading_dot" &&`
`43`	`48`	`git rev-parse "refs/remotes/trailing_dot%2E" &&`
`44`	`49`	`git rev-parse "refs/remotes/trailing_dotlock%2Elock" &&`
`45`		`- git rev-parse "refs/remotes/not-a%40{0}reflog"`
	`50`	`+ git rev-parse "refs/remotes/$non_reflog"`
`46`	`51`	`)`
`47`	`52`	`'`
`48`	`53`