Commit 08221e73 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

tests: phase out haxx.se 

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.
parent 16dcd13a

tests/data/test1008

+6 −6
Original line number Diff line number Diff line
@@ -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
@@ -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>

tests/data/test1021

+8 −8
Original line number Diff line number Diff line
@@ -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
@@ -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>

tests/data/test209

+6 −6
Original line number Diff line number Diff line
@@ -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
@@ -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>

tests/data/test213

+6 −6
Original line number Diff line number Diff line
@@ -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
@@ -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

tests/data/test217

+3 −3
Original line number Diff line number Diff line
@@ -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>
@@ -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>