t5550: put auth-required repo in auth/dumb

In most of our tests, we put repos to be accessed by dumb
protocols in /dumb, and repos to be accessed by smart
protocols in /smart.  In our test apache setup, the whole
/auth hierarchy requires authentication. However, we don't
bother to split it by smart and dumb here because we are not
currently testing smart-http authentication at all.

That will change in future patches, so let's be explicit
that we are interested in testing dumb access here. This
also happens to match what t5540 does for the push tests.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index b06f817af32483631b3ec297246e156400bc6b93..5ad21233e19bb37b1a63a17ac0ad14a545b13434 100755 (executable)
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -41,9 +41,9 @@ test_expect_success 'clone http repository' '
 '
 
 test_expect_success 'create password-protected repository' '
 '
 
 test_expect_success 'create password-protected repository' '

-       mkdir "$HTTPD_DOCUMENT_ROOT_PATH/auth/" &&
+       mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/" &&

        cp -Rf "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
        cp -Rf "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \

-              "$HTTPD_DOCUMENT_ROOT_PATH/auth/repo.git"
+              "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/repo.git"

 '
 
 test_expect_success 'setup askpass helpers' '
 '
 
 test_expect_success 'setup askpass helpers' '


@@ -81,28 +81,28 @@ expect_askpass() {
 test_expect_success 'cloning password-protected repository can fail' '
        >askpass-query &&
        echo wrong >askpass-response &&
 test_expect_success 'cloning password-protected repository can fail' '
        >askpass-query &&
        echo wrong >askpass-response &&

-       test_must_fail git clone "$HTTPD_URL/auth/repo.git" clone-auth-fail &&
+       test_must_fail git clone "$HTTPD_URL/auth/dumb/repo.git" clone-auth-fail &&

        expect_askpass both wrong
 '
 
 test_expect_success 'http auth can use user/pass in URL' '
        >askpass-query &&
        echo wrong >askpass-response &&
        expect_askpass both wrong
 '
 
 test_expect_success 'http auth can use user/pass in URL' '
        >askpass-query &&
        echo wrong >askpass-response &&

-       git clone "$HTTPD_URL_USER_PASS/auth/repo.git" clone-auth-none &&
+       git clone "$HTTPD_URL_USER_PASS/auth/dumb/repo.git" clone-auth-none &&

        expect_askpass none
 '
 
 test_expect_success 'http auth can use just user in URL' '
        >askpass-query &&
        echo user@host >askpass-response &&
        expect_askpass none
 '
 
 test_expect_success 'http auth can use just user in URL' '
        >askpass-query &&
        echo user@host >askpass-response &&

-       git clone "$HTTPD_URL_USER/auth/repo.git" clone-auth-pass &&
+       git clone "$HTTPD_URL_USER/auth/dumb/repo.git" clone-auth-pass &&

        expect_askpass pass user@host
 '
 
 test_expect_success 'http auth can request both user and pass' '
        >askpass-query &&
        echo user@host >askpass-response &&
        expect_askpass pass user@host
 '
 
 test_expect_success 'http auth can request both user and pass' '
        >askpass-query &&
        echo user@host >askpass-response &&

-       git clone "$HTTPD_URL/auth/repo.git" clone-auth-both &&
+       git clone "$HTTPD_URL/auth/dumb/repo.git" clone-auth-both &&

        expect_askpass both user@host
 '
 
        expect_askpass both user@host
 '
 


@@ -114,7 +114,7 @@ test_expect_success 'http auth respects credential helper config' '
        }; f" &&
        >askpass-query &&
        echo wrong >askpass-response &&
        }; f" &&
        >askpass-query &&
        echo wrong >askpass-response &&

-       git clone "$HTTPD_URL/auth/repo.git" clone-auth-helper &&
+       git clone "$HTTPD_URL/auth/dumb/repo.git" clone-auth-helper &&

        expect_askpass none
 '
 
        expect_askpass none
 '
 


@@ -122,7 +122,7 @@ test_expect_success 'http auth can get username from config' '
        test_config_global "credential.$HTTPD_URL.username" user@host &&
        >askpass-query &&
        echo user@host >askpass-response &&
        test_config_global "credential.$HTTPD_URL.username" user@host &&
        >askpass-query &&
        echo user@host >askpass-response &&

-       git clone "$HTTPD_URL/auth/repo.git" clone-auth-user &&
+       git clone "$HTTPD_URL/auth/dumb/repo.git" clone-auth-user &&

        expect_askpass pass user@host
 '
 
        expect_askpass pass user@host
 '
 


@@ -130,7 +130,7 @@ test_expect_success 'configured username does not override URL' '
        test_config_global "credential.$HTTPD_URL.username" wrong &&
        >askpass-query &&
        echo user@host >askpass-response &&
        test_config_global "credential.$HTTPD_URL.username" wrong &&
        >askpass-query &&
        echo user@host >askpass-response &&

-       git clone "$HTTPD_URL_USER/auth/repo.git" clone-auth-user2 &&
+       git clone "$HTTPD_URL_USER/auth/dumb/repo.git" clone-auth-user2 &&

        expect_askpass pass user@host
 '
 
        expect_askpass pass user@host
 '