git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Clemens Buchacher <drizzd@aon.at>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Erik Faye-Lund" <kusmabite@gmail.com>,
	"Ilari Liusvaara" <ilari.liusvaara@elisanet.fi>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 3/5] git-daemon: add tests
Date: Sat,  7 Jan 2012 12:42:45 +0100	[thread overview]
Message-ID: <1325936567-3136-4-git-send-email-drizzd@aon.at> (raw)
In-Reply-To: <1325936567-3136-1-git-send-email-drizzd@aon.at>

The semantics of the git daemon tests are similar to the http transport
tests.  In fact, they are only a slightly modified copy of t5550, plus the
newly added remote error tests.

All git-daemon tests will be skipped unless the environment variable
GIT_TEST_GIT_DAEMON is set.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/lib-git-daemon.sh   |   53 +++++++++++++++++
 t/t5570-git-daemon.sh |  148 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+), 0 deletions(-)
 create mode 100644 t/lib-git-daemon.sh
 create mode 100755 t/t5570-git-daemon.sh

diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
new file mode 100644
index 0000000..5e81a25
--- /dev/null
+++ b/t/lib-git-daemon.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+if test -z "$GIT_TEST_GIT_DAEMON"
+then
+	skip_all="git-daemon testing disabled (define GIT_TEST_GIT_DAEMON to enable)"
+	test_done
+fi
+
+LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-'8121'}
+
+GIT_DAEMON_PID=
+GIT_DAEMON_DOCUMENT_ROOT_PATH="$PWD"/repo
+GIT_DAEMON_URL=git://127.0.0.1:$LIB_GIT_DAEMON_PORT
+
+start_git_daemon() {
+	if test -n "$GIT_DAEMON_PID"
+	then
+		error "start_git_daemon already called"
+	fi
+
+	mkdir -p "$GIT_DAEMON_DOCUMENT_ROOT_PATH"
+
+	trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
+
+	say >&3 "Starting git daemon ..."
+	git daemon --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
+		--reuseaddr --verbose \
+		--base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
+		"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
+		>&3 2>&4 &
+	GIT_DAEMON_PID=$!
+}
+
+stop_git_daemon() {
+	if test -z "$GIT_DAEMON_PID"
+	then
+		return
+	fi
+
+	trap 'die' EXIT
+
+	# kill git-daemon child of git
+	say >&3 "Stopping git daemon ..."
+	kill "$GIT_DAEMON_PID"
+	wait "$GIT_DAEMON_PID" >&3 2>&4
+	ret=$?
+	# expect exit with status 143 = 128+15 for signal TERM=15
+	if test $ret -ne 143
+	then
+		error "git daemon exited with status: $ret"
+	fi
+	GIT_DAEMON_PID=
+}
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
new file mode 100755
index 0000000..7cbc999
--- /dev/null
+++ b/t/t5570-git-daemon.sh
@@ -0,0 +1,148 @@
+#!/bin/sh
+
+test_description='test fetching over git protocol'
+. ./test-lib.sh
+
+LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-5570}
+. "$TEST_DIRECTORY"/lib-git-daemon.sh
+start_git_daemon
+
+test_expect_success 'setup repository' '
+	echo content >file &&
+	git add file &&
+	git commit -m one
+'
+
+test_expect_success 'create git-accessible bare repository' '
+	mkdir "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	 git --bare init &&
+	 : >git-daemon-export-ok
+	) &&
+	git remote add public "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	git push public master:master
+'
+
+test_expect_success 'clone git repository' '
+	git clone "$GIT_DAEMON_URL/repo.git" clone &&
+	test_cmp file clone/file
+'
+
+test_expect_success 'fetch changes via git protocol' '
+	echo content >>file &&
+	git commit -a -m two &&
+	git push public &&
+	(cd clone && git pull) &&
+	test_cmp file clone/file
+'
+
+test_expect_failure 'remote detects correct HEAD' '
+	git push public master:other &&
+	(cd clone &&
+	 git remote set-head -d origin &&
+	 git remote set-head -a origin &&
+	 git symbolic-ref refs/remotes/origin/HEAD > output &&
+	 echo refs/remotes/origin/master > expect &&
+	 test_cmp expect output
+	)
+'
+
+test_expect_success 'prepare pack objects' '
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
+	 git --bare repack -a -d
+	)
+'
+
+test_expect_success 'fetch notices corrupt pack' '
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
+	 p=`ls objects/pack/pack-*.pack` &&
+	 chmod u+w $p &&
+	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
+	) &&
+	mkdir repo_bad1.git &&
+	(cd repo_bad1.git &&
+	 git --bare init &&
+	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad1.git" &&
+	 test 0 = `ls objects/pack/pack-*.pack | wc -l`
+	)
+'
+
+test_expect_success 'fetch notices corrupt idx' '
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
+	 p=`ls objects/pack/pack-*.idx` &&
+	 chmod u+w $p &&
+	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
+	) &&
+	mkdir repo_bad2.git &&
+	(cd repo_bad2.git &&
+	 git --bare init &&
+	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad2.git" &&
+	 test 0 = `ls objects/pack | wc -l`
+	)
+'
+
+test_remote_error()
+{
+	do_export=YesPlease
+	while test $# -gt 0
+	do
+		case $1 in
+		-x)
+			shift
+			chmod -x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git"
+			;;
+		-n)
+			shift
+			do_export=
+			;;
+		*)
+			break
+		esac
+	done
+
+	if test $# -ne 3
+	then
+		error "invalid number of arguments"
+	fi
+
+	cmd=$1
+	repo=$2
+	msg=$3
+
+	if test -x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/$repo"
+	then
+		if test -n "$do_export"
+		then
+			: >"$GIT_DAEMON_DOCUMENT_ROOT_PATH/$repo/git-daemon-export-ok"
+		else
+			rm -f "$GIT_DAEMON_DOCUMENT_ROOT_PATH/$repo/git-daemon-export-ok"
+		fi
+	fi
+
+	test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" 2>output &&
+	echo "fatal: remote error: $msg: /$repo" >expect &&
+	test_cmp expect output
+	ret=$?
+	chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git"
+	(exit $ret)
+}
+
+msg="access denied or repository not exported"
+test_expect_success 'clone non-existent' "test_remote_error    clone nowhere.git '$msg'"
+test_expect_success 'push disabled'      "test_remote_error    push  repo.git    '$msg'"
+test_expect_success 'read access denied' "test_remote_error -x fetch repo.git    '$msg'"
+test_expect_success 'not exported'       "test_remote_error -n fetch repo.git    '$msg'"
+
+stop_git_daemon
+start_git_daemon --informative-errors
+
+test_expect_success 'clone non-existent' "test_remote_error    clone nowhere.git 'no such repository'"
+test_expect_success 'push disabled'      "test_remote_error    push  repo.git    'service not enabled'"
+test_expect_success 'read access denied' "test_remote_error -x fetch repo.git    'no such repository'"
+test_expect_success 'not exported'       "test_remote_error -n fetch repo.git    'repository not exported'"
+
+stop_git_daemon
+test_done
-- 
1.7.8

  parent reply	other threads:[~2012-01-07 11:51 UTC|newest]

Thread overview: 117+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-01  1:26 [PATCH] transport: do not allow to push over git:// protocol Nguyễn Thái Ngọc Duy
2011-10-01  2:25 ` Ilari Liusvaara
2011-10-01  4:27   ` Nguyen Thai Ngoc Duy
2011-10-01  5:29   ` Jonathan Nieder
2011-10-03  9:12     ` Nguyen Thai Ngoc Duy
     [not found] ` <20111002223805.0bd6678b@zappedws>
2011-10-02 21:11   ` Nguyen Thai Ngoc Duy
2011-10-03  7:42 ` Jeff King
2011-10-03  8:44   ` Johannes Sixt
2011-10-03  9:39     ` Jeff King
2011-10-03  9:44       ` Nguyen Thai Ngoc Duy
2011-10-03  9:47         ` Jeff King
2011-10-03  9:52           ` Nguyen Thai Ngoc Duy
2011-10-03 11:13         ` Jonathan Nieder
2011-10-03 19:28           ` [PATCH] daemon: print "access denied" if a service does not work Nguyễn Thái Ngọc Duy
2011-10-03 19:54             ` Jonathan Nieder
2011-10-03 19:57             ` Junio C Hamano
2011-10-03 21:55               ` [PATCH] daemon: return "access denied" if a service is not allowed Nguyễn Thái Ngọc Duy
2011-10-03 22:20                 ` Junio C Hamano
2011-10-12 20:09                 ` Jeff King
2011-10-13  2:14                   ` Jonathan Nieder
2011-10-13  4:45                   ` Nguyen Thai Ngoc Duy
2011-10-13  5:59                     ` Jonathan Nieder
2011-10-13  6:56                       ` Nguyen Thai Ngoc Duy
2011-10-13  7:02                         ` Nguyen Thai Ngoc Duy
2011-10-13 18:28                     ` Jeff King
2011-10-14  5:01                       ` Junio C Hamano
2011-10-14 13:10                         ` Jeff King
2011-10-14 19:23                           ` Jeff King
2011-10-14 19:27                             ` Jeff King
2011-10-14 20:24                               ` Junio C Hamano
2011-10-14 20:34                                 ` Jeff King
2011-10-14 20:48                                   ` Junio C Hamano
2011-10-14 21:05                                     ` Jeff King
2011-10-14 21:06                                       ` Jonathan Nieder
2011-10-14 21:20                               ` Jonathan Nieder
2011-10-14 21:02                             ` Jonathan Nieder
2011-10-14 21:12                               ` Jeff King
2011-10-14 21:19                                 ` [PATCHv3] daemon: give friendlier error messages to clients Jeff King
2011-10-14 21:52                                   ` Junio C Hamano
2011-10-14 23:39                                   ` Sitaram Chamarty
2011-10-15  5:55                                     ` Junio C Hamano
2011-10-15  7:09                                       ` Sitaram Chamarty
2011-10-15  8:16                                         ` Jakub Narebski
2011-10-15  8:26                                           ` Jonathan Nieder
2011-10-15 20:13                                             ` Junio C Hamano
2011-10-15 22:17                                               ` Jonathan Nieder
2011-10-16  1:51                                                 ` Sitaram Chamarty
2011-10-15  0:51                                   ` Nguyen Thai Ngoc Duy
2011-10-16 22:11                                   ` [PATCH 1/2] daemon: add tests Clemens Buchacher
2011-10-16 22:11                                     ` [PATCH 2/2] daemon: report permission denied error to clients Clemens Buchacher
2011-10-17  2:09                                       ` Jeff King
2011-10-17 19:48                                         ` Clemens Buchacher
2011-10-17 19:51                                           ` Jeff King
2011-10-17 21:03                                         ` Junio C Hamano
2011-10-18 20:41                                           ` Clemens Buchacher
2011-10-19  6:33                                             ` Clemens Buchacher
2011-10-17 19:58                                       ` [PATCH v2 " Clemens Buchacher
2011-10-21 19:25                                         ` Junio C Hamano
2011-10-17  2:01                                     ` [PATCH 1/2] daemon: add tests Jeff King
2011-10-17 19:55                                       ` [PATCH] use test number as port number Clemens Buchacher
2011-10-17 20:57                                         ` Junio C Hamano
2011-10-18 20:09                                           ` Clemens Buchacher
2011-10-17 20:05                                       ` [PATCH 1/2] daemon: add tests Clemens Buchacher
2011-10-17 20:08                                         ` Jeff King
2012-01-02  9:25                                     ` Jonathan Nieder
2012-01-02 19:47                                       ` Clemens Buchacher
2012-01-03 19:18                                         ` Jeff King
2012-01-03 19:34                                       ` Junio C Hamano
2012-01-04 15:55                                         ` Clemens Buchacher
2012-01-04 15:55                                           ` [PATCH 1/6] t5550: repack everything into one file Clemens Buchacher
2012-01-04 18:05                                             ` Junio C Hamano
2012-01-04 15:55                                           ` [PATCH 2/6] daemon: add tests Clemens Buchacher
2012-01-04 15:55                                           ` [PATCH 3/6] avoid use of pkill Clemens Buchacher
2012-01-04 15:55                                           ` [PATCH 4/6] explain expected exit code Clemens Buchacher
2012-01-04 15:55                                           ` [PATCH 5/6] t5570: repack everything into one file Clemens Buchacher
2012-01-04 15:55                                           ` [PATCH 6/6] chmod: use lower-case x Clemens Buchacher
2012-01-04 18:00                                           ` [PATCH 1/2] daemon: add tests Junio C Hamano
2012-01-04 20:13                                             ` Junio C Hamano
2012-01-04 20:40                                             ` Clemens Buchacher
2012-01-04 22:15                                               ` Junio C Hamano
2012-01-04 22:26                                                 ` Jeff King
2012-01-05  0:07                                                   ` Clemens Buchacher
2012-01-05  0:24                                                     ` Junio C Hamano
2012-01-05  0:38                                                       ` Clemens Buchacher
2012-01-05  2:55                                                     ` Jeff King
2012-01-05 16:06                                                       ` Clemens Buchacher
2012-01-06 15:52                                                         ` Jeff King
2012-01-06 19:48                                                           ` Clemens Buchacher
2012-01-06 22:32                                                             ` Jeff King
2012-01-07 11:54                                                               ` [PATCH] credentials: unable to connect to cache daemon Clemens Buchacher
2012-01-07 14:55                                                                 ` Jeff King
2012-01-06 22:49                                                             ` [PATCH 1/2] daemon: add tests Junio C Hamano
2012-01-07 11:42                                                               ` Clemens Buchacher
2012-01-07 11:42                                                                 ` [PATCH 1/5] run-command: optionally kill children on exit Clemens Buchacher
2012-01-07 12:45                                                                   ` Erik Faye-Lund
2012-01-08 20:56                                                                     ` Clemens Buchacher
2012-01-07 14:41                                                                   ` Jeff King
2012-01-07 11:42                                                                 ` [PATCH 2/5] run-command: kill children on exit by default Clemens Buchacher
2012-01-07 14:50                                                                   ` Jeff King
2012-01-08  6:26                                                                     ` Junio C Hamano
2012-01-08 20:41                                                                       ` [PATCH 2/5 v2] dashed externals: kill children on exit Clemens Buchacher
2012-01-08 21:07                                                                         ` Jeff King
2012-01-07 11:42                                                                 ` Clemens Buchacher [this message]
2012-01-07 11:42                                                                 ` [PATCH 4/5] git-daemon: produce output when ready Clemens Buchacher
2012-01-07 11:42                                                                 ` [PATCH 5/5] git-daemon tests: wait until daemon is ready Clemens Buchacher
2012-01-05  2:24                                                   ` [PATCH 1/2] daemon: add tests Jakub Narebski
2012-01-05  2:51                                                     ` Jeff King
2012-01-06 23:35                                                       ` Jakub Narebski
2012-01-07 11:46                                                         ` Clemens Buchacher
2012-01-06  6:17                                           ` Brian Gernhardt
2011-10-03  9:49     ` [PATCH] transport: do not allow to push over git:// protocol Jakub Narebski
2011-10-03 10:02       ` Jeff King
2011-10-03 11:01   ` Ilari Liusvaara
2011-10-03 11:26     ` [PATCH] Support ERR in remote archive like in fetch/push Jonathan Nieder
2011-10-03 11:45       ` René Scharfe
2011-10-03 18:13     ` [PATCH] transport: do not allow to push over git:// protocol Nguyen Thai Ngoc Duy
2011-10-03 20:27       ` Junio C Hamano

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=1325936567-3136-4-git-send-email-drizzd@aon.at \
    --to=drizzd@aon.at \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ilari.liusvaara@elisanet.fi \
    --cc=jrnieder@gmail.com \
    --cc=kusmabite@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    /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).