From bfdd78f7576d2d5cc7fba6be98cce11a0a72051f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 8 Jan 2012 15:04:45 -0800 Subject: [PATCH] Revert "daemon: add tests" This reverts the cb/git-daemon-tests topic, to queue its fresh reroll. --- t/lib-git-daemon.sh | 56 ---------------- t/t5570-git-daemon.sh | 148 ------------------------------------------ 2 files changed, 204 deletions(-) delete mode 100644 t/lib-git-daemon.sh delete mode 100755 t/t5570-git-daemon.sh diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh deleted file mode 100644 index c0ff9e2b65..0000000000 --- a/t/lib-git-daemon.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/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 ..." - pkill -P "$GIT_DAEMON_PID" - wait "$GIT_DAEMON_PID" - ret=$? - # - # We signal TERM=15 to the child and expect the parent to - # exit with 143 = 128+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 deleted file mode 100755 index 7cbc9994a3..0000000000 --- a/t/t5570-git-daemon.sh +++ /dev/null @@ -1,148 +0,0 @@ -#!/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