Re: t9010 broken in pu [Re: What's cooking in git.git (Dec 2010, #01; Sat, 4)]

From

Jonathan Nieder <jrnieder@gmail.com>

Date

Dec 8, 2010, 11:28 UTC

Message-ID

<20101208112836.GA5285@burratino>

In-Reply-To

<201012081223.47642.trast@student.ethz.ch>

Thomas Rast wrote:

> If I'm reading the test report right, the merge conflict in
> t/t9010-svn-fe.sh broke tests.  It bisects to 5ea8b68 (Merge branch
> 'jn/svn-fe' into pu, 2010-12-07), failing with

[...]

> A quick reading of the merge suggests that you concatenated with an
> earlier test that goes
> 
>   test_dump () {

[...]

> hence creating simple-svn, too.  So a rename or rm -rf should suffice.

diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index 6e3b6ad..d207aeb 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -14,31 +14,6 @@ svn_cmd () {
 	svn "$subcommand" --config-dir "$svnconf" "$@"
 }
 
-test_dump () {
-	label=$1
-	dump=$2
-	test_expect_success "$dump" '
-		svnadmin create "$label-svn" &&
-		svnadmin load "$label-svn" < "$TEST_DIRECTORY/$dump" &&
-		svn_cmd export "file://$PWD/$label-svn" "$label-svnco" &&
-		git init "$label-git" &&
-		test-svn-fe "$TEST_DIRECTORY/$dump" >"$label.fe" &&
-		(
-			cd "$label-git" &&
-			git fast-import < ../"$label.fe"
-		) &&
-		(
-			cd "$label-svnco" &&
-			git init &&
-			git add . &&
-			git fetch "../$label-git" master &&
-			git diff --exit-code FETCH_HEAD
-		)
-	'
-}
-
-test_dump simple t9135/svn.dump
-
 reinit_git () {
 	rm -fr .git &&
 	git init