Merge branch 'al/docs'
[gitweb.git] / t / t5541-http-push.sh
index 470ac54295e8640feb4d23a81c5dc8ce362857d0..73af16f481836d3cbfa8a2f82c260d10a3a43c09 100755 (executable)
@@ -12,7 +12,6 @@ if test -n "$NO_CURL"; then
 fi
 
 ROOT_PATH="$PWD"
-LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'}
 . "$TEST_DIRECTORY"/lib-httpd.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 start_httpd
@@ -274,7 +273,7 @@ test_expect_success 'push over smart http with auth' '
        cd "$ROOT_PATH/test_repo_clone" &&
        echo push-auth-test >expect &&
        test_commit push-auth-test &&
-       set_askpass user@host &&
+       set_askpass user@host pass@host &&
        git push "$HTTPD_URL"/auth/smart/test_repo.git &&
        git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git" \
                log -1 --format=%s >actual &&
@@ -286,7 +285,7 @@ test_expect_success 'push to auth-only-for-push repo' '
        cd "$ROOT_PATH/test_repo_clone" &&
        echo push-half-auth >expect &&
        test_commit push-half-auth &&
-       set_askpass user@host &&
+       set_askpass user@host pass@host &&
        git push "$HTTPD_URL"/auth-push/smart/test_repo.git &&
        git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git" \
                log -1 --format=%s >actual &&
@@ -316,7 +315,7 @@ test_expect_success 'push into half-auth-complete requires password' '
        cd "$ROOT_PATH/half-auth-clone" &&
        echo two >expect &&
        test_commit two &&
-       set_askpass user@host &&
+       set_askpass user@host pass@host &&
        git push "$HTTPD_URL/half-auth-complete/smart/half-auth.git" &&
        git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/half-auth.git" \
                log -1 --format=%s >actual &&