29633bb91c
Renaming files with non-URI friendly characters caused
breakage when committing to DAV repositories (over http(s)).
Even if I try leaving out the $self->{url} from the return value
of url_path(), a partial (without host), unescaped path name
does not work.
Filenames for DAV repos need to be URI-encoded before being
passed to the library. Since this bug did not affect file://
and svn:// repos, the git-svn test library needed to be expanded
to include support for starting Apache with mod_dav_svn enabled.
This new test is not enabled by default, but can be enabled by
setting SVN_HTTPD_PORT to any available TCP/IP port on
127.0.0.1.
Additionally, for running this test, the following variables
(with defaults shown) can be changed for the suitable system.
The default values are set for Debian systems:
SVN_HTTPD_MODULE_PATH=/usr/lib/apache2/modules
SVN_HTTPD_PATH=/usr/sbin/apache2
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
85 lines
1.7 KiB
Bash
85 lines
1.7 KiB
Bash
. ./test-lib.sh
|
|
|
|
if test -n "$NO_SVN_TESTS"
|
|
then
|
|
test_expect_success 'skipping git-svn tests, NO_SVN_TESTS defined' :
|
|
test_done
|
|
exit
|
|
fi
|
|
|
|
GIT_DIR=$PWD/.git
|
|
GIT_SVN_DIR=$GIT_DIR/svn/git-svn
|
|
SVN_TREE=$GIT_SVN_DIR/svn-tree
|
|
|
|
svn >/dev/null 2>&1
|
|
if test $? -ne 1
|
|
then
|
|
test_expect_success 'skipping git-svn tests, svn not found' :
|
|
test_done
|
|
exit
|
|
fi
|
|
|
|
svnrepo=$PWD/svnrepo
|
|
|
|
perl -w -e "
|
|
use SVN::Core;
|
|
use SVN::Repos;
|
|
\$SVN::Core::VERSION gt '1.1.0' or exit(42);
|
|
system(qw/svnadmin create --fs-type fsfs/, '$svnrepo') == 0 or exit(41);
|
|
" >&3 2>&4
|
|
x=$?
|
|
if test $x -ne 0
|
|
then
|
|
if test $x -eq 42; then
|
|
err='Perl SVN libraries must be >= 1.1.0'
|
|
elif test $x -eq 41; then
|
|
err='svnadmin failed to create fsfs repository'
|
|
else
|
|
err='Perl SVN libraries not found or unusable, skipping test'
|
|
fi
|
|
test_expect_success "$err" :
|
|
test_done
|
|
exit
|
|
fi
|
|
|
|
rawsvnrepo="$svnrepo"
|
|
svnrepo="file://$svnrepo"
|
|
|
|
poke() {
|
|
test-chmtime +1 "$1"
|
|
}
|
|
|
|
SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'}
|
|
SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'}
|
|
|
|
start_httpd () {
|
|
if test -z "$SVN_HTTPD_PORT"
|
|
then
|
|
echo >&2 'SVN_HTTPD_PORT is not defined!'
|
|
return
|
|
fi
|
|
|
|
mkdir "$GIT_DIR"/logs
|
|
|
|
cat > "$GIT_DIR/httpd.conf" <<EOF
|
|
ServerName "git-svn test"
|
|
ServerRoot "$GIT_DIR"
|
|
DocumentRoot "$GIT_DIR"
|
|
PidFile "$GIT_DIR/httpd.pid"
|
|
Listen 127.0.0.1:$SVN_HTTPD_PORT
|
|
LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
|
|
LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so
|
|
<Location /svn>
|
|
DAV svn
|
|
SVNPath $rawsvnrepo
|
|
</Location>
|
|
EOF
|
|
"$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start
|
|
svnrepo=http://127.0.0.1:$SVN_HTTPD_PORT/svn
|
|
}
|
|
|
|
stop_httpd () {
|
|
test -z "$SVN_HTTPD_PORT" && return
|
|
"$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k stop
|
|
}
|