http tests: use /dumb/ URL prefix

To clarify what part of the HTTP transprot is being tested we change
the URLs used by existing tests to include /dumb/ at the start,
indicating they use the non-Git aware code paths.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
CC: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 21aa42f1c613538ba26c0b613cc0d1b001bc52b9..47a438f4c67edc6925f9dac9820b92bf82607cc0 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -8,6 +8,11 @@ ErrorLog error.log
 <IfModule !mod_log_config.c>
        LoadModule log_config_module modules/mod_log_config.so
 </IfModule>
 <IfModule !mod_log_config.c>
        LoadModule log_config_module modules/mod_log_config.so
 </IfModule>

+<IfModule !mod_alias.c>
+       LoadModule alias_module modules/mod_alias.so
+</IfModule>
+
+Alias /dumb/ www/

 
 <IfDefine SSL>
 LoadModule ssl_module modules/mod_ssl.so
 
 <IfDefine SSL>
 LoadModule ssl_module modules/mod_ssl.so


@@ -26,7 +31,7 @@ SSLEngine On
        LoadModule dav_fs_module modules/mod_dav_fs.so
 
        DAVLockDB DAVLock
        LoadModule dav_fs_module modules/mod_dav_fs.so
 
        DAVLockDB DAVLock

-       <Location />
+       <Location /dumb/>

                Dav on
        </Location>
 </IfDefine>
                Dav on
        </Location>
 </IfDefine>

diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index d1234f9feff52c6788555e9086ec293d8a655b1e..4a9450e79f7d37bd86d9a80c8f52c8e44e5dbb73 100755 (executable)
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -42,7 +42,7 @@ test_expect_success 'setup remote repository' '
 
 test_expect_success 'clone remote repository' '
        cd "$ROOT_PATH" &&
 
 test_expect_success 'clone remote repository' '
        cd "$ROOT_PATH" &&

-       git clone $HTTPD_URL/test_repo.git test_repo_clone
+       git clone $HTTPD_URL/dumb/test_repo.git test_repo_clone

 '
 
 test_expect_success 'push to remote repository with packed refs' '
 '
 
 test_expect_success 'push to remote repository with packed refs' '


@@ -75,7 +75,7 @@ test_expect_success 'http-push fetches unpacked objects' '
        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_unpacked.git &&
 
        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_unpacked.git &&
 

-       git clone $HTTPD_URL/test_repo_unpacked.git \
+       git clone $HTTPD_URL/dumb/test_repo_unpacked.git \

                "$ROOT_PATH"/fetch_unpacked &&
 
        # By reset, we force git to retrieve the object
                "$ROOT_PATH"/fetch_unpacked &&
 
        # By reset, we force git to retrieve the object


@@ -84,14 +84,14 @@ test_expect_success 'http-push fetches unpacked objects' '
         git remote rm origin &&
         git reflog expire --expire=0 --all &&
         git prune &&
         git remote rm origin &&
         git reflog expire --expire=0 --all &&
         git prune &&

-        git push -f -v $HTTPD_URL/test_repo_unpacked.git master)
+        git push -f -v $HTTPD_URL/dumb/test_repo_unpacked.git master)

 '
 
 test_expect_success 'http-push fetches packed objects' '
        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&
 
 '
 
 test_expect_success 'http-push fetches packed objects' '
        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&
 

-       git clone $HTTPD_URL/test_repo_packed.git \
+       git clone $HTTPD_URL/dumb/test_repo_packed.git \

                "$ROOT_PATH"/test_repo_clone_packed &&
 
        (cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&
                "$ROOT_PATH"/test_repo_clone_packed &&
 
        (cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&


@@ -104,7 +104,7 @@ test_expect_success 'http-push fetches packed objects' '
         git remote rm origin &&
         git reflog expire --expire=0 --all &&
         git prune &&
         git remote rm origin &&
         git reflog expire --expire=0 --all &&
         git prune &&

-        git push -f -v $HTTPD_URL/test_repo_packed.git master)
+        git push -f -v $HTTPD_URL/dumb/test_repo_packed.git master)

 '
 
 test_expect_success 'create and delete remote branch' '
 '
 
 test_expect_success 'create and delete remote branch' '

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index 0e69324652026bdeeb319c36782fe1130b0510a1..776057c54311a7f8c4457ce8532883a5152737f0 100755 (executable)
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -30,7 +30,7 @@ test_expect_success 'create http-accessible bare repository' '
 '
 
 test_expect_success 'clone http repository' '
 '
 
 test_expect_success 'clone http repository' '

-       git clone $HTTPD_URL/repo.git clone &&
+       git clone $HTTPD_URL/dumb/repo.git clone &&

        test_cmp file clone/file
 '
 
        test_cmp file clone/file
 '
 


@@ -58,7 +58,7 @@ test_expect_success 'fetch packed objects' '
        cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
        git --bare repack &&
        git --bare prune-packed &&
        cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
        git --bare repack &&
        git --bare prune-packed &&

-       git clone $HTTPD_URL/repo_pack.git
+       git clone $HTTPD_URL/dumb/repo_pack.git

 '
 
 stop_httpd
 '
 
 stop_httpd