From: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
To: GIT Mailing-list <git@vger.kernel.org>
Cc: David Michael Barr <b@rr-dav.id.au>,
Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
Subject: [PATCH v8 16/16] Add a test script for remote-svn
Date: Wed, 19 Sep 2012 17:21:30 +0200 [thread overview]
Message-ID: <1348068090-31988-17-git-send-email-florian.achleitner.2.6.31@gmail.com> (raw)
In-Reply-To: <1348068090-31988-16-git-send-email-florian.achleitner.2.6.31@gmail.com>
Use svnrdump_sim.py to emulate svnrdump without an svn server.
Tests fetching, incremental fetching, fetching from file://,
and the regeneration of fast-import's marks file.
Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff:
- move pathname of marks file to a variable to compact the code.
t/t9020-remote-svn.sh | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
create mode 100755 t/t9020-remote-svn.sh
diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
new file mode 100755
index 0000000..4f2dfe0
--- /dev/null
+++ b/t/t9020-remote-svn.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+test_description='tests remote-svn'
+
+. ./test-lib.sh
+
+MARKSPATH=.git/info/fast-import/remote-svn
+
+if ! test_have_prereq PYTHON
+then
+ skip_all='skipping remote-svn tests, python not available'
+ test_done
+fi
+
+# We override svnrdump by placing a symlink to the svnrdump-emulator in .
+export PATH="$HOME:$PATH"
+ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
+
+init_git () {
+ rm -fr .git &&
+ git init &&
+ #git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
+ # let's reuse an exisiting dump file!?
+ git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump
+ git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump
+}
+
+if test -e "$GIT_BUILD_DIR/git-remote-testsvn"
+then
+ test_set_prereq REMOTE_SVN
+fi
+
+test_debug '
+ git --version
+ which git
+ which svnrdump
+'
+
+test_expect_success REMOTE_SVN 'simple fetch' '
+ init_git &&
+ git fetch svnsim &&
+ test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master &&
+ cp .git/refs/remotes/svnsim/master master.good
+'
+
+test_debug '
+ cat .git/refs/svn/svnsim/master
+ cat .git/refs/remotes/svnsim/master
+'
+
+test_expect_success REMOTE_SVN 'repeated fetch, nothing shall change' '
+ git fetch svnsim &&
+ test_cmp master.good .git/refs/remotes/svnsim/master
+'
+
+test_expect_success REMOTE_SVN 'fetch from a file:// url gives the same result' '
+ git fetch svnfile
+'
+
+test_expect_failure REMOTE_SVN 'the sha1 differ because the git-svn-id line in the commit msg contains the url' '
+ test_cmp .git/refs/remotes/svnfile/master .git/refs/remotes/svnsim/master
+'
+
+test_expect_success REMOTE_SVN 'mark-file regeneration' '
+ # filter out any other marks, that can not be regenerated. Only up to 3 digit revisions are allowed here
+ grep ":[0-9]\{1,3\} " $MARKSPATH/svnsim.marks > $MARKSPATH/svnsim.marks.old &&
+ rm $MARKSPATH/svnsim.marks &&
+ git fetch svnsim &&
+ test_cmp $MARKSPATH/svnsim.marks.old $MARKSPATH/svnsim.marks
+'
+
+test_expect_success REMOTE_SVN 'incremental imports must lead to the same head' '
+ export SVNRMAX=3 &&
+ init_git &&
+ git fetch svnsim &&
+ test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master &&
+ unset SVNRMAX &&
+ git fetch svnsim &&
+ test_cmp master.good .git/refs/remotes/svnsim/master
+'
+
+test_debug 'git branch -a'
+
+test_done
--
1.7.9.5
prev parent reply other threads:[~2012-09-19 15:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 15:21 [PATCH v8 00/16] GSOC remote-svn Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 02/16] Add git-remote-testsvn to Makefile Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 04/16] Add argv_array_detach and argv_array_free_detached Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 05/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 06/16] Add documentation for the 'bidi-import' capability of remote-helpers Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 07/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 08/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 09/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 10/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 11/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 12/16] remote-svn: Activate import/export-marks for fast-import Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 13/16] remote-svn: add incremental import Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 14/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-09-19 15:21 ` [PATCH v8 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-09-19 15:21 ` Florian Achleitner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348068090-31988-17-git-send-email-florian.achleitner.2.6.31@gmail.com \
--to=florian.achleitner.2.6.31@gmail.com \
--cc=b@rr-dav.id.au \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).