http-push: add regression tests

http-push tests require a web server with WebDAV support.

This commit introduces a HTTPD test library, which can be configured using
the following environment variables.

GIT_TEST_HTTPD		enable HTTPD tests
LIB_HTTPD_PATH		web server path
LIB_HTTPD_MODULE_PATH	web server modules path
LIB_HTTPD_PORT		listening port
LIB_HTTPD_DAV		enable DAV
LIB_HTTPD_SVN		enable SVN
LIB_HTTPD_SSL		enable SSL

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
new file mode 100644 (file)
index 0000000..7f206c5
--- /dev/null
+++ b/t/lib-httpd.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
+#
+
+if test -z "$GIT_TEST_HTTPD"
+then
+       say "skipping test, network testing disabled by default"
+       say "(define GIT_TEST_HTTPD to enable)"
+       test_done
+       exit
+fi
+
+LIB_HTTPD_PATH=${LIB_HTTPD_PATH-'/usr/sbin/apache2'}
+LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'8111'}
+
+TEST_PATH="$PWD"/../lib-httpd
+HTTPD_ROOT_PATH="$PWD"/httpd
+HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
+
+if ! test -x "$LIB_HTTPD_PATH"
+then
+        say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
+        test_done
+        exit
+fi
+
+HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
+       sed -n 's/^Server version: Apache\/\([0-9]*\)\..*$/\1/p; q'`
+
+if test -n "$HTTPD_VERSION"
+then
+       if test -z "$LIB_HTTPD_MODULE_PATH"
+       then
+               if ! test $HTTPD_VERSION -ge 2
+               then
+                       say "skipping test, at least Apache version 2 is required"
+                       test_done
+                       exit
+               fi
+
+               LIB_HTTPD_MODULE_PATH='/usr/lib/apache2/modules'
+       fi
+else
+       error "Could not identify web server at '$LIB_HTTPD_PATH'"
+fi
+
+HTTPD_PARA="-d $HTTPD_ROOT_PATH -f $TEST_PATH/apache.conf"
+
+prepare_httpd() {
+       mkdir -p $HTTPD_DOCUMENT_ROOT_PATH
+
+       ln -s $LIB_HTTPD_MODULE_PATH $HTTPD_ROOT_PATH/modules
+
+       if test -n "$LIB_HTTPD_SSL"
+       then
+               HTTPD_URL=https://127.0.0.1:$LIB_HTTPD_PORT
+
+               RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \
+                       -config $TEST_PATH/ssl.cnf \
+                       -new -x509 -nodes \
+                       -out $HTTPD_ROOT_PATH/httpd.pem \
+                       -keyout $HTTPD_ROOT_PATH/httpd.pem
+               export GIT_SSL_NO_VERIFY=t
+               HTTPD_PARA="$HTTPD_PARA -DSSL"
+       else
+               HTTPD_URL=http://127.0.0.1:$LIB_HTTPD_PORT
+       fi
+
+       if test -n "$LIB_HTTPD_DAV" -o -n "$LIB_HTTPD_SVN"
+       then
+               HTTPD_PARA="$HTTPD_PARA -DDAV"
+
+               if test -n "$LIB_HTTPD_SVN"
+               then
+                       HTTPD_PARA="$HTTPD_PARA -DSVN"
+                       rawsvnrepo="$HTTPD_ROOT_PATH/svnrepo"
+                       svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/svn"
+               fi
+       fi
+}
+
+start_httpd() {
+       prepare_httpd
+
+       trap 'stop_httpd; die' exit
+
+       "$LIB_HTTPD_PATH" $HTTPD_PARA \
+               -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start
+}
+
+stop_httpd() {
+       trap 'die' exit
+
+       "$LIB_HTTPD_PATH" $HTTPD_PARA -k stop
+}

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
new file mode 100644 (file)
index 0000000..a447346
--- /dev/null
+++ b/t/lib-httpd/apache.conf
@@ -0,0 +1,34 @@
+PidFile httpd.pid
+DocumentRoot www
+ErrorLog error.log
+
+<IfDefine SSL>
+LoadModule ssl_module modules/mod_ssl.so
+
+SSLCertificateFile httpd.pem
+SSLCertificateKeyFile httpd.pem
+SSLRandomSeed startup file:/dev/urandom 512
+SSLRandomSeed connect file:/dev/urandom 512
+SSLSessionCache none
+SSLMutex file:ssl_mutex
+SSLEngine On
+</IfDefine>
+
+<IfDefine DAV>
+       LoadModule dav_module modules/mod_dav.so
+       LoadModule dav_fs_module modules/mod_dav_fs.so
+
+       DAVLockDB DAVLock
+       <Location />
+               Dav on
+       </Location>
+</IfDefine>
+
+<IfDefine SVN>
+       LoadModule dav_svn_module modules/mod_dav_svn.so
+
+       <Location /svn>
+               DAV svn
+               SVNPath svnrepo
+       </Location>
+</IfDefine>

diff --git a/t/lib-httpd/ssl.cnf b/t/lib-httpd/ssl.cnf
new file mode 100644 (file)
index 0000000..6dab257
--- /dev/null
+++ b/t/lib-httpd/ssl.cnf
@@ -0,0 +1,8 @@
+RANDFILE                = $ENV::RANDFILE_PATH
+
+[ req ]
+default_bits            = 1024
+distinguished_name      = req_distinguished_name
+prompt                  = no
+[ req_distinguished_name ]
+commonName              = 127.0.0.1

diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
new file mode 100755 (executable)
index 0000000..7372439
--- /dev/null
+++ b/t/t5540-http-push.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
+#
+
+test_description='test http-push
+
+This test runs various sanity checks on http-push.'
+
+. ./test-lib.sh
+
+ROOT_PATH="$PWD"
+LIB_HTTPD_DAV=t
+
+. ../lib-httpd.sh
+
+if ! start_httpd >&3 2>&4
+then
+       say "skipping test, web server setup failed"
+       test_done
+       exit
+fi
+
+test_expect_success 'setup remote repository' '
+       cd "$ROOT_PATH" &&
+       mkdir test_repo &&
+       cd test_repo &&
+       git init &&
+       : >path1 &&
+       git add path1 &&
+       test_tick &&
+       git commit -m initial &&
+       cd - &&
+       git clone --bare test_repo test_repo.git &&
+       cd test_repo.git &&
+       git --bare update-server-info &&
+       chmod +x hooks/post-update &&
+       cd - &&
+       mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH
+'
+       
+test_expect_success 'clone remote repository' '
+       cd "$ROOT_PATH" &&
+       git clone $HTTPD_URL/test_repo.git test_repo_clone
+'
+
+test_expect_success 'push to remote repository' '
+       cd "$ROOT_PATH"/test_repo_clone &&
+       : >path2 &&
+       git add path2 &&
+       test_tick &&
+       git commit -m path2 &&
+       git push
+'
+
+test_expect_success 'create and delete remote branch' '
+       cd "$ROOT_PATH"/test_repo_clone &&
+       git checkout -b dev &&
+       : >path3 &&
+       git add path3 &&
+       test_tick &&
+       git commit -m dev &&
+       git push origin dev &&
+       git fetch &&
+       git push origin :dev &&
+       git branch -d -r origin/dev &&
+       git fetch &&
+       ! git show-ref --verify refs/remotes/origin/dev
+'
+
+stop_httpd
+
+test_done

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 83889c4f4690d30fd2d5e969d5d445dfb47ad579..9d9cb8d5a1de359e6431dd58b002b065d5651268 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -80,7 +80,7 @@ do
        -q|--q|--qu|--qui|--quie|--quiet)
                quiet=t; shift ;;
        --no-color)
-           color=; shift ;;
+               color=; shift ;;
        --no-python)
                # noop now...
                shift ;;
@@ -142,7 +142,12 @@ test_count=0
 test_fixed=0
 test_broken=0
 
-trap 'echo >&5 "FATAL: Unexpected exit with code $?"; exit 1' exit
+die () {
+       echo >&5 "FATAL: Unexpected exit with code $?"
+       exit 1
+}
+
+trap 'die' exit
 
 test_tick () {
        if test -z "${test_tick+set}"