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>
Shawn O. Pearce committed
Oct 30, 2009 at 17:47 UTC
024bb1256627219671a0924b195582b6e049ca87
3 files changed
+13
-8
t/lib-httpd/apache.conf
+6
-1
@@ -8,6 +8,11 @@ ErrorLog error.log
8
<IfModule !mod_log_config.c>
9
LoadModule log_config_module modules/mod_log_config.so
10
</IfModule>
11
+<IfModule !mod_alias.c>
12
+ LoadModule alias_module modules/mod_alias.so
13
+</IfModule>
14
+
15
+Alias /dumb/ www/
16
17
<IfDefine SSL>
18
LoadModule ssl_module modules/mod_ssl.so
@@ -26,7 +31,7 @@ SSLEngine On
31
LoadModule dav_fs_module modules/mod_dav_fs.so
32
33
DAVLockDB DAVLock
29
- <Location />
34
+ <Location /dumb/>
35
Dav on
36
</Location>
37
</IfDefine>
t/t5540-http-push.sh
+5
-5
@@ -42,7 +42,7 @@ test_expect_success 'setup remote repository' '
42
43
test_expect_success 'clone remote repository' '
44
cd "$ROOT_PATH" &&
45
- git clone $HTTPD_URL/test_repo.git test_repo_clone
45
+ git clone $HTTPD_URL/dumb/test_repo.git test_repo_clone
46
'
47
48
test_expect_success 'push to remote repository with packed refs' '
@@ -75,7 +75,7 @@ test_expect_success 'http-push fetches unpacked objects' '
75
cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
76
"$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_unpacked.git &&
77
78
- git clone $HTTPD_URL/test_repo_unpacked.git \
78
+ git clone $HTTPD_URL/dumb/test_repo_unpacked.git \
79
"$ROOT_PATH"/fetch_unpacked &&
80
81
# By reset, we force git to retrieve the object
@@ -84,14 +84,14 @@ test_expect_success 'http-push fetches unpacked objects' '
84
git remote rm origin &&
85
git reflog expire --expire=0 --all &&
86
git prune &&
87
- git push -f -v $HTTPD_URL/test_repo_unpacked.git master)
87
+ git push -f -v $HTTPD_URL/dumb/test_repo_unpacked.git master)
88
'
89
90
test_expect_success 'http-push fetches packed objects' '
91
cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
92
"$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&
93
94
- git clone $HTTPD_URL/test_repo_packed.git \
94
+ git clone $HTTPD_URL/dumb/test_repo_packed.git \
95
"$ROOT_PATH"/test_repo_clone_packed &&
96
97
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&
@@ -104,7 +104,7 @@ test_expect_success 'http-push fetches packed objects' '
104
git remote rm origin &&
105
git reflog expire --expire=0 --all &&
106
git prune &&
107
- git push -f -v $HTTPD_URL/test_repo_packed.git master)
107
+ git push -f -v $HTTPD_URL/dumb/test_repo_packed.git master)
108
'
109
110
test_expect_success 'create and delete remote branch' '
t/t5550-http-fetch.sh
+2
-2
@@ -30,7 +30,7 @@ test_expect_success 'create http-accessible bare repository' '
30
'
31
32
test_expect_success 'clone http repository' '
33
- git clone $HTTPD_URL/repo.git clone &&
33
+ git clone $HTTPD_URL/dumb/repo.git clone &&
34
test_cmp file clone/file
35
'
36
@@ -58,7 +58,7 @@ test_expect_success 'fetch packed objects' '
58
cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
59
git --bare repack &&
60
git --bare prune-packed &&
61
- git clone $HTTPD_URL/repo_pack.git
61
+ git clone $HTTPD_URL/dumb/repo_pack.git
62
'
63
64
stop_httpd