[PATCH v3 3/3] Smart-http tests: Test http-backend without curl or a webserver
- From
- Tarmigan Casebolt <tarmigan+git@gmail.com>
- Date
- Jan 2, 2010, 20:45 UTC
- Message-ID
- <1262465119-96115-3-git-send-email-tarmigan+git@gmail.com>
- In-Reply-To
- <905315641001021244o522ac092g7fdaaab83a2609e2@mail.gmail.com>
This reuses many of the tests from t5560 but runs those tests without curl or a webserver. This will hopefully increase the testing coverage for http-backend because it does not require users to set GIT_TEST_HTTPD.
Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> --- t/t5561-http-backend-noserver.sh | 30 ++++++++++++++++++++++++------ t/t556x_common | 3 +++ 2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/t/t5561-http-backend-noserver.sh b/t/t5561-http-backend-noserver.sh index a9ba2d9..9013824 100755 --- a/t/t5561-http-backend-noserver.sh +++ b/t/t5561-http-backend-noserver.sh @@ -6,18 +6,36 @@ test_description='test git-http-backend-noserver' HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY" run_backend() { - REQUEST_METHOD=GET \ + echo "$2"| \ + QUERY_STRING="${1#*\?}" \ GIT_PROJECT_ROOT="$HTTPD_DOCUMENT_ROOT_PATH" \ - PATH_INFO="$1" \ + PATH_INFO="${1%%\?*}" \ git http-backend >act.out 2>act.err } GET() { - return 0 + REQUEST_METHOD="GET" \ + run_backend "/repo.git/$1" && + grep "Status" act.out >act + if [ $? -eq 1 ]; + then + printf "Status: 200 OK\r\n" > act + fi + printf "Status: $2\r\n" > exp && + test_cmp exp act } POST() { - return 0 + REQUEST_METHOD="POST" \ + CONTENT_TYPE="application/x-$1-request" \ + run_backend "/repo.git/$1" "$2" && + grep "Status" act.out >act + if [ $? -eq 1 ]; + then + printf "Status: 200 OK\r\n" > act + fi + printf "Status: $3\r\n" > exp && + test_cmp exp act } log_div() { @@ -28,9 +46,9 @@ log_div() { expect_aliased() { if test $1 = 0; then - run_backend "$2" + REQUEST_METHOD=GET run_backend "$2" else - run_backend "$2" && + REQUEST_METHOD=GET run_backend "$2" && echo "fatal: '$2': aliased" >exp.err && test_cmp exp.err act.err fi diff --git a/t/t556x_common b/t/t556x_common index 1b4921c..be024e5 100755 --- a/t/t556x_common +++ b/t/t556x_common @@ -50,6 +50,7 @@ get_static_files() { } SMART=smart +export GIT_HTTP_EXPORT_ALL=1 test_expect_success 'direct refs/heads/master not found' ' log_div "refs/heads/master" GET refs/heads/master "404 Not Found" @@ -59,6 +60,7 @@ test_expect_success 'static file is ok' ' get_static_files "200 OK" ' SMART=smart_noexport +unset GIT_HTTP_EXPORT_ALL test_expect_success 'no export by default' ' log_div "no git-daemon-export-ok" get_static_files "404 Not Found" @@ -71,6 +73,7 @@ test_expect_success 'export if git-daemon-export-ok' ' get_static_files "200 OK" ' SMART=smart +export GIT_HTTP_EXPORT_ALL=1 test_expect_success 'static file if http.getanyfile true is ok' ' log_div "getanyfile true" config http.getanyfile true &&
-- 1.6.6