Skip to content

Commit

Permalink
tests: phase out haxx.se
Browse files Browse the repository at this point in the history
Instead of using haxx.se as a fixed magic host name in lots of tests,
this is a first step to move toward the generic example.com host
instead.
  • Loading branch information
bagder committed Mar 9, 2011
1 parent 16dcd13 commit 08221e7
Show file tree
Hide file tree
Showing 17 changed files with 78 additions and 78 deletions.
12 changes: 6 additions & 6 deletions tests/data/test1008
Expand Up @@ -93,7 +93,7 @@ CURL_GETHOSTNAME=curlhost
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
</setenv>
<command>
http://test.remote.haxx.se:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
http://test.remote.example.com:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
</command>
<precheck>
chkhostname curlhost
Expand All @@ -106,19 +106,19 @@ chkhostname curlhost
^User-Agent: curl/.*
</strip>
<protocol>
CONNECT test.remote.haxx.se:1008 HTTP/1.1
Host: test.remote.haxx.se:1008
CONNECT test.remote.example.com:1008 HTTP/1.1
Host: test.remote.example.com:1008
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
Proxy-Connection: Keep-Alive

CONNECT test.remote.haxx.se:1008 HTTP/1.1
Host: test.remote.haxx.se:1008
CONNECT test.remote.example.com:1008 HTTP/1.1
Host: test.remote.example.com:1008
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
Proxy-Connection: Keep-Alive

GET /path/10080002 HTTP/1.1
User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
Host: test.remote.haxx.se:1008
Host: test.remote.example.com:1008
Accept: */*

</protocol>
Expand Down
16 changes: 8 additions & 8 deletions tests/data/test1021
Expand Up @@ -102,7 +102,7 @@ CURL_GETHOSTNAME=curlhost
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
</setenv>
<command>
http://test.remote.haxx.se:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel
http://test.remote.example.com:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel
</command>
<precheck>
chkhostname curlhost
Expand All @@ -115,23 +115,23 @@ chkhostname curlhost
^User-Agent: curl/.*
</strip>
<protocol>
CONNECT test.remote.haxx.se:1021 HTTP/1.1
Host: test.remote.haxx.se:1021
CONNECT test.remote.example.com:1021 HTTP/1.1
Host: test.remote.example.com:1021
Proxy-Connection: Keep-Alive

CONNECT test.remote.haxx.se:1021 HTTP/1.1
Host: test.remote.haxx.se:1021
CONNECT test.remote.example.com:1021 HTTP/1.1
Host: test.remote.example.com:1021
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
Proxy-Connection: Keep-Alive

CONNECT test.remote.haxx.se:1021 HTTP/1.1
Host: test.remote.haxx.se:1021
CONNECT test.remote.example.com:1021 HTTP/1.1
Host: test.remote.example.com:1021
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
Proxy-Connection: Keep-Alive

GET /path/10210002 HTTP/1.1
User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
Host: test.remote.haxx.se:1021
Host: test.remote.example.com:1021
Accept: */*

</protocol>
Expand Down
12 changes: 6 additions & 6 deletions tests/data/test209
Expand Up @@ -86,7 +86,7 @@ CURL_GETHOSTNAME=curlhost
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
</setenv>
<command>
http://test.remote.haxx.se:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
http://test.remote.example.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
</command>
<precheck>
chkhostname curlhost
Expand All @@ -99,19 +99,19 @@ chkhostname curlhost
^User-Agent: curl/.*
</strip>
<protocol>
CONNECT test.remote.haxx.se:209 HTTP/1.1
Host: test.remote.haxx.se:209
CONNECT test.remote.example.com:209 HTTP/1.1
Host: test.remote.example.com:209
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
Proxy-Connection: Keep-Alive

CONNECT test.remote.haxx.se:209 HTTP/1.1
Host: test.remote.haxx.se:209
CONNECT test.remote.example.com:209 HTTP/1.1
Host: test.remote.example.com:209
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
Proxy-Connection: Keep-Alive

GET /path/2090002 HTTP/1.1
User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
Host: test.remote.haxx.se:209
Host: test.remote.example.com:209
Accept: */*

</protocol>
Expand Down
12 changes: 6 additions & 6 deletions tests/data/test213
Expand Up @@ -86,7 +86,7 @@ CURL_GETHOSTNAME=curlhost
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
</setenv>
<command>
http://test.remote.haxx.se:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
http://test.remote.example.com:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
</command>
<precheck>
chkhostname curlhost
Expand All @@ -99,19 +99,19 @@ chkhostname curlhost
^User-Agent: curl/.*
</strip>
<protocol nonewline="yes">
CONNECT test.remote.haxx.se:213 HTTP/1.0
Host: test.remote.haxx.se:213
CONNECT test.remote.example.com:213 HTTP/1.0
Host: test.remote.example.com:213
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
Proxy-Connection: Keep-Alive

CONNECT test.remote.haxx.se:213 HTTP/1.0
Host: test.remote.haxx.se:213
CONNECT test.remote.example.com:213 HTTP/1.0
Host: test.remote.example.com:213
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
Proxy-Connection: Keep-Alive

POST /path/2130002 HTTP/1.1
User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
Host: test.remote.haxx.se:213
Host: test.remote.example.com:213
Accept: */*
Content-Length: 6
Content-Type: application/x-www-form-urlencoded
Expand Down
6 changes: 3 additions & 3 deletions tests/data/test217
Expand Up @@ -32,7 +32,7 @@ http
HTTP proxy CONNECT to proxy returning 405
</name>
<command>
http://test.remote.haxx.se:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
http://test.remote.example.com:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
</command>
</client>

Expand All @@ -42,8 +42,8 @@ http://test.remote.haxx.se:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --p
^User-Agent: curl/.*
</strip>
<protocol>
CONNECT test.remote.haxx.se:217 HTTP/1.1
Host: test.remote.haxx.se:217
CONNECT test.remote.example.com:217 HTTP/1.1
Host: test.remote.example.com:217
Proxy-Connection: Keep-Alive

</protocol>
Expand Down
12 changes: 6 additions & 6 deletions tests/data/test265
Expand Up @@ -89,7 +89,7 @@ CURL_GETHOSTNAME=curlhost
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
</setenv>
<command>
http://test.remote.haxx.se:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
http://test.remote.example.com:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
</command>
<precheck>
chkhostname curlhost
Expand All @@ -102,19 +102,19 @@ chkhostname curlhost
^User-Agent: curl/.*
</strip>
<protocol nonewline="yes">
CONNECT test.remote.haxx.se:265 HTTP/1.1
Host: test.remote.haxx.se:265
CONNECT test.remote.example.com:265 HTTP/1.1
Host: test.remote.example.com:265
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
Proxy-Connection: Keep-Alive

CONNECT test.remote.haxx.se:265 HTTP/1.1
Host: test.remote.haxx.se:265
CONNECT test.remote.example.com:265 HTTP/1.1
Host: test.remote.example.com:265
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
Proxy-Connection: Keep-Alive

POST /path/2650002 HTTP/1.1
User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
Host: test.remote.haxx.se:265
Host: test.remote.example.com:265
Accept: */*
Content-Length: 6
Content-Type: application/x-www-form-urlencoded
Expand Down
6 changes: 3 additions & 3 deletions tests/data/test287
Expand Up @@ -29,15 +29,15 @@ http
HTTP proxy CONNECT with custom User-Agent header
</name>
<command>
http://test.remote.haxx.se:287/path/287 -H "User-Agent: looser/2007" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel
http://test.remote.example.com:287/path/287 -H "User-Agent: looser/2007" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel
</command>
</client>

# Verify data after the test has been "shot"
<verify>
<protocol>
CONNECT test.remote.haxx.se:287 HTTP/1.1
Host: test.remote.haxx.se:287
CONNECT test.remote.example.com:287 HTTP/1.1
Host: test.remote.example.com:287
Proxy-Connection: Keep-Alive
User-Agent: looser/2007

Expand Down
8 changes: 4 additions & 4 deletions tests/data/test540
Expand Up @@ -64,7 +64,7 @@ crypto
HTTP proxy auth Digest multi API re-using connection
</name>
<command>
http://test.remote.haxx.se/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
</command>
</client>

Expand All @@ -74,18 +74,18 @@ http://test.remote.haxx.se/path/540 http://%HOSTIP:%HTTPPORT silly:person custom
^User-Agent: curl/.*
</strip>
<protocol>
GET http://test.remote.haxx.se/path/540 HTTP/1.1
GET http://test.remote.example.com/path/540 HTTP/1.1
Accept: */*
Proxy-Connection: Keep-Alive
Host: custom.set.host.name

GET http://test.remote.haxx.se/path/540 HTTP/1.1
GET http://test.remote.example.com/path/540 HTTP/1.1
Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
Accept: */*
Proxy-Connection: Keep-Alive
Host: custom.set.host.name

GET http://test.remote.haxx.se/path/540 HTTP/1.1
GET http://test.remote.example.com/path/540 HTTP/1.1
Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
Accept: */*
Proxy-Connection: Keep-Alive
Expand Down
14 changes: 7 additions & 7 deletions tests/data/test547
Expand Up @@ -87,7 +87,7 @@ CURL_GETHOSTNAME=curlhost
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
</setenv>
<command>
http://test.remote.haxx.se/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n
http://test.remote.example.com/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n
</command>
<precheck>
chkhostname curlhost
Expand All @@ -100,28 +100,28 @@ chkhostname curlhost
^User-Agent: curl/.*
</strip>
<protocol>
POST http://test.remote.haxx.se/path/547 HTTP/1.1
POST http://test.remote.example.com/path/547 HTTP/1.1
User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
Host: test.remote.haxx.se
Host: test.remote.example.com
Accept: */*
Proxy-Connection: Keep-Alive
Content-Length: 36
Content-Type: application/x-www-form-urlencoded

this is the blurb we want to upload
POST http://test.remote.haxx.se/path/547 HTTP/1.1
POST http://test.remote.example.com/path/547 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
Host: test.remote.haxx.se
Host: test.remote.example.com
Accept: */*
Proxy-Connection: Keep-Alive
Content-Length: 0
Content-Type: application/x-www-form-urlencoded

POST http://test.remote.haxx.se/path/547 HTTP/1.1
POST http://test.remote.example.com/path/547 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAIYrD1xJmhNBNL9fLzuk9PV9436GAxPu0EKWzqQ/sZDVLXnp1JrySgl8A+cibE6z4HMxbGx5Y3VybGhvc3Q=
User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
Host: test.remote.haxx.se
Host: test.remote.example.com
Accept: */*
Proxy-Connection: Keep-Alive
Content-Length: 36
Expand Down
14 changes: 7 additions & 7 deletions tests/data/test548
Expand Up @@ -87,7 +87,7 @@ CURL_GETHOSTNAME=curlhost
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
</setenv>
<command>
http://test.remote.haxx.se/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n
http://test.remote.example.com/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n
</command>
<precheck>
chkhostname curlhost
Expand All @@ -100,28 +100,28 @@ chkhostname curlhost
^User-Agent: curl/.*
</strip>
<protocol>
POST http://test.remote.haxx.se/path/548 HTTP/1.1
POST http://test.remote.example.com/path/548 HTTP/1.1
User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
Host: test.remote.haxx.se
Host: test.remote.example.com
Accept: */*
Proxy-Connection: Keep-Alive
Content-Length: 36
Content-Type: application/x-www-form-urlencoded

this is the blurb we want to upload
POST http://test.remote.haxx.se/path/548 HTTP/1.1
POST http://test.remote.example.com/path/548 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
Host: test.remote.haxx.se
Host: test.remote.example.com
Accept: */*
Proxy-Connection: Keep-Alive
Content-Length: 0
Content-Type: application/x-www-form-urlencoded

POST http://test.remote.haxx.se/path/548 HTTP/1.1
POST http://test.remote.example.com/path/548 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAIYrD1xJmhNBNL9fLzuk9PV9436GAxPu0EKWzqQ/sZDVLXnp1JrySgl8A+cibE6z4HMxbGx5Y3VybGhvc3Q=
User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
Host: test.remote.haxx.se
Host: test.remote.example.com
Accept: */*
Proxy-Connection: Keep-Alive
Content-Length: 36
Expand Down
6 changes: 3 additions & 3 deletions tests/data/test549
Expand Up @@ -41,7 +41,7 @@ FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE
</name>
# first URL then proxy
<command>
ftp://www.haxx.se/moo/549 http://%HOSTIP:%HTTPPORT
ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT
</command>
</client>

Expand All @@ -52,8 +52,8 @@ ftp://www.haxx.se/moo/549 http://%HOSTIP:%HTTPPORT
^User-Agent:.*
</strip>
<protocol>
GET ftp://www.haxx.se/moo/549;type=i HTTP/1.1
Host: www.haxx.se:21
GET ftp://www.example.com/moo/549;type=i HTTP/1.1
Host: www.example.com:21
Accept: */*
Proxy-Connection: Keep-Alive

Expand Down
6 changes: 3 additions & 3 deletions tests/data/test550
Expand Up @@ -41,7 +41,7 @@ FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
</name>
# first URL then proxy
<command>
ftp://www.haxx.se/moo/550 http://%HOSTIP:%HTTPPORT ascii
ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
</command>
</client>

Expand All @@ -52,8 +52,8 @@ ftp://www.haxx.se/moo/550 http://%HOSTIP:%HTTPPORT ascii
^User-Agent:.*
</strip>
<protocol>
GET ftp://www.haxx.se/moo/550;type=a HTTP/1.1
Host: www.haxx.se:21
GET ftp://www.example.com/moo/550;type=a HTTP/1.1
Host: www.example.com:21
Accept: */*
Proxy-Connection: Keep-Alive

Expand Down

0 comments on commit 08221e7

Please sign in to comment.