Repeatable test t9010-svn-fe.sh failure w/ master (685e9d9, 1.7.4.rc1)

System:
	Linux debian 2.6.32-5-amd64 #1 SMP Fri Dec 10 15:35:08 UTC 2010 x86_64 
GNU/Linux
	All installed packages up-to-date as of 2011-01-06 15:55 UTC

Git:
	Latest master (685e9d9)
	$ ./git --version
	git version 1.7.4.rc1

Svn:
	libsvn-perl	1.6.12dfsg-3
	libsvn1		1.6.12dfsg-3
	subversion	1.6.12dfsg-3

Invocation:
	(make NO_OPENSSL=1 'gitexecdir=$(bindir)' all test strip)



*** t9010-svn-fe.sh ***
ok 1 - empty dump
ok 2 - v3 dumps not supported
not ok - 3 t9135/svn.dump
#
#               svnadmin create simple-svn &&
#               svnadmin load simple-svn 
<"$TEST_DIRECTORY/t9135/svn.dump" &&
#               svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
#               git init simple-git &&
#               test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
#               (
#                       cd simple-git &&
#                       git fast-import <../simple.fe
#               ) &&
#               (
#                       cd simple-svnco &&
#                       git init &&
#                       git add . &&
#                       git fetch ../simple-git master &&
#                       git diff --exit-code FETCH_HEAD
#               )
#
# failed 1 among 3 test(s)
1..3

A Large Angry SCM wrote:

*** t9010-svn-fe.sh ***
ok 1 - empty dump
ok 2 - v3 dumps not supported
not ok - 3 t9135/svn.dump

Thanks for reporting.  Unfortunately I haven't been able to reproduce
this on the machines I have access to (amd64 with svn 1.5.0 and i386
with svn 1.6.15).

Does running

	sh t9010-svn-fe.sh -v

from the t/ directory give an error message?  If not, how about

	GIT_TRACE=1 sh -x t9010-svn-fe.sh -v

?

On 01/06/2011 11:59 AM, Jonathan Nieder wrote:

A Large Angry SCM wrote:

quoted

*** t9010-svn-fe.sh ***
ok 1 - empty dump
ok 2 - v3 dumps not supported
not ok - 3 t9135/svn.dump

Thanks for reporting.  Unfortunately I haven't been able to reproduce
this on the machines I have access to (amd64 with svn 1.5.0 and i386
with svn 1.6.15).

Does running

	sh t9010-svn-fe.sh -v

from the t/ directory give an error message?  If not, how about

	GIT_TRACE=1 sh -x t9010-svn-fe.sh -v

?

See the attached typescript files from the above runs.

If svn is built against one version of SQLite and run against
another, svnadmin (needlessly) errors out during t9010:

 <<< Started new transaction, based on original revision 1
      * adding path : branches ... done.
      * adding path : trunk ... done.
 svnadmin: Couldn't perform atomic initialization
 svnadmin: Couldn't perform atomic initialization
 svnadmin: SQLite compiled for 3.7.4, but running with 3.7.3

Work around this by putting the svn invocations into a single test
that builds a repo to compare the test-svn-fe result against.  This
test would always pass but only set the new SVNREPO test prereq if svn
succeeds; and the test using that repo gets an SVNREPO prerequisite so
it only runs with working svn installations.

This seems like the right thing to, anyway: the test script is meant
to test the version of git just built, not the installed svn.

As a side effect, earlier tests will run now even if svn is not
installed.  Remove the svn_cmd () helper to decrease the temptation to
run svn from those tests.

Works-around: http://bugs.debian.org/608925
Reported-by: A Large Angry SCM <redacted>
Signed-off-by: Jonathan Nieder <redacted>
---
Thanks.  Does this patch work for you?

 t/t9010-svn-fe.sh |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index c96bf2f..88a9751 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh

@@ -4,22 +4,6 @@ test_description='check svn dumpfile importer'
 
 . ./test-lib.sh
 
-if ! svnadmin -h >/dev/null 2>&1
-then
-	skip_all='skipping svn-fe tests, svn not available'
-	test_done
-fi
-
-svnconf=$PWD/svnconf
-export svnconf
-
-svn_cmd () {
-	subcommand=$1 &&
-	shift &&
-	mkdir -p "$svnconf" &&
-	svn "$subcommand" --config-dir "$svnconf" "$@"
-}
-
 reinit_git () {
 	rm -fr .git &&
 	git init

@@ -41,10 +25,21 @@ test_expect_success 'v3 dumps not supported' '
 	test_cmp empty stream
 '
 
-test_expect_success 't9135/svn.dump' '
-	svnadmin create simple-svn &&
-	svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
-	svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
+test_expect_success 'set up svn repo' '
+	svnconf=$PWD/svnconf &&
+	mkdir -p "$svnconf" &&
+
+	if
+		svnadmin -h >/dev/null 2>&1 &&
+		svnadmin create simple-svn &&
+		svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
+		svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco
+	then
+		test_set_prereq SVNREPO
+	fi
+'
+
+test_expect_success SVNREPO 't9135/svn.dump' '
 	git init simple-git &&
 	test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
 	(

-- 
1.7.4.rc1

On 01/06/2011 01:00 PM, Jonathan Nieder wrote:

If svn is built against one version of SQLite and run against
another, svnadmin (needlessly) errors out during t9010:

  <<<  Started new transaction, based on original revision 1
       * adding path : branches ... done.
       * adding path : trunk ... done.
  svnadmin: Couldn't perform atomic initialization
  svnadmin: Couldn't perform atomic initialization
  svnadmin: SQLite compiled for 3.7.4, but running with 3.7.3

Work around this by putting the svn invocations into a single test
that builds a repo to compare the test-svn-fe result against.  This
test would always pass but only set the new SVNREPO test prereq if svn
succeeds; and the test using that repo gets an SVNREPO prerequisite so
it only runs with working svn installations.

This seems like the right thing to, anyway: the test script is meant
to test the version of git just built, not the installed svn.

As a side effect, earlier tests will run now even if svn is not
installed.  Remove the svn_cmd () helper to decrease the temptation to
run svn from those tests.

Works-around: http://bugs.debian.org/608925
Reported-by: A Large Angry SCM<redacted>
Signed-off-by: Jonathan Nieder<redacted>
---
Thanks.  Does this patch work for you?

$ sh t9010-svn-fe.sh
ok 1 - empty dump
ok 2 - v3 dumps not supported
ok 3 - set up svn repo
ok 4 # skip t9135/svn.dump (missing SVNREPO)
# passed all 4 test(s)
1..4

Rerunning the full test suite now ...