Fix existing HTTP11Connection test cases

Author: fredthomsen

test/test_http11.py

@@ -38,16 +38,16 @@ def test_pycohttpparser_installs_correctly(self):
         assert True
 
     def test_initialization_no_port(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
 
-        assert c.host == 'http2bin.org'
+        assert c.host == 'httpbin.org'
         assert c.port == 80
         assert not c.secure
 
     def test_initialization_inline_port(self):
-        c = HTTP11Connection('http2bin.org:443')
+        c = HTTP11Connection('httpbin.org:443')
 
-        assert c.host == 'http2bin.org'
+        assert c.host == 'httpbin.org'
         assert c.port == 443
         assert c.secure
 
@@ -66,23 +66,26 @@ def test_can_override_security(self):
         assert not c.secure
 
     def test_basic_request(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()
 
         c.request('GET', '/get', headers={'User-Agent': 'hyper'})
 
         expected = (
             b"GET /get HTTP/1.1\r\n"
             b"User-Agent: hyper\r\n"
-            b"host: http2bin.org\r\n"
+            b"connection: Upgrade, HTTP2-Settings\r\n"
+            b"upgrade: h2c\r\n"
+            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"host: httpbin.org\r\n"
             b"\r\n"
         )
         received = b''.join(sock.queue)
 
         assert received == expected
 
     def test_request_with_bytestring_body(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()
 
         c.request(
@@ -95,8 +98,11 @@ def test_request_with_bytestring_body(self):
         expected = (
             b"POST /post HTTP/1.1\r\n"
             b"User-Agent: hyper\r\n"
+            b"connection: Upgrade, HTTP2-Settings\r\n"
+            b"upgrade: h2c\r\n"
+            b"HTTP2-Settings: AAQAAP//\r\n"
             b"content-length: 2\r\n"
-            b"host: http2bin.org\r\n"
+            b"host: httpbin.org\r\n"
             b"\r\n"
             b"hi"
         )
@@ -116,16 +122,19 @@ def fake_fstat(*args):
 
         try:
             hyper.http11.connection.os.fstat = fake_fstat
-            c = HTTP11Connection('http2bin.org')
+            c = HTTP11Connection('httpbin.org')
             c._sock = sock = DummySocket()
 
             f = DummyFile(b'some binary data')
             c.request('POST', '/post',  body=f)
 
             expected = (
                 b"POST /post HTTP/1.1\r\n"
+                b"connection: Upgrade, HTTP2-Settings\r\n"
+                b"upgrade: h2c\r\n"
+                b"HTTP2-Settings: AAQAAP//\r\n"
                 b"content-length: 16\r\n"
-                b"host: http2bin.org\r\n"
+                b"host: httpbin.org\r\n"
                 b"\r\n"
                 b"some binary data"
             )
@@ -138,7 +147,7 @@ def fake_fstat(*args):
             hyper.http11.connection.os.fstat = old_fstat
 
     def test_request_with_generator_body(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()
         def body():
             yield b'hi'
@@ -149,8 +158,11 @@ def body():
 
         expected = (
             b"POST /post HTTP/1.1\r\n"
+            b"connection: Upgrade, HTTP2-Settings\r\n"
+            b"upgrade: h2c\r\n"
+            b"HTTP2-Settings: AAQAAP//\r\n"
             b"transfer-encoding: chunked\r\n"
-            b"host: http2bin.org\r\n"
+            b"host: httpbin.org\r\n"
             b"\r\n"
             b"2\r\nhi\r\n"
             b"5\r\nthere\r\n"
@@ -162,7 +174,7 @@ def body():
         assert received == expected
 
     def test_content_length_overrides_generator(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()
         def body():
             yield b'hi'
@@ -176,7 +188,10 @@ def body():
         expected = (
             b"POST /post HTTP/1.1\r\n"
             b"content-length: 10\r\n"
-            b"host: http2bin.org\r\n"
+            b"connection: Upgrade, HTTP2-Settings\r\n"
+            b"upgrade: h2c\r\n"
+            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"host: httpbin.org\r\n"
             b"\r\n"
             b"hitheresir"
         )
@@ -185,7 +200,7 @@ def body():
         assert received == expected
 
     def test_chunked_overrides_body(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()
 
         f = DummyFile(b'oneline\nanotherline')
@@ -200,7 +215,10 @@ def test_chunked_overrides_body(self):
         expected = (
             b"POST /post HTTP/1.1\r\n"
             b"transfer-encoding: chunked\r\n"
-            b"host: http2bin.org\r\n"
+            b"connection: Upgrade, HTTP2-Settings\r\n"
+            b"upgrade: h2c\r\n"
+            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"host: httpbin.org\r\n"
             b"\r\n"
             b"8\r\noneline\n\r\n"
             b"b\r\nanotherline\r\n"
@@ -211,7 +229,7 @@ def test_chunked_overrides_body(self):
         assert received == expected
 
     def test_get_response(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()
 
         sock._buffer= BytesIO(
@@ -234,7 +252,7 @@ def test_get_response(self):
         assert r.read() == b''
 
     def test_response_short_reads(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()
 
         sock._buffer= BytesIO(
@@ -254,7 +272,7 @@ def test_response_short_reads(self):
         assert r.read(5) == b''
 
     def test_request_with_unicodestring_body(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = DummySocket()
 
         with pytest.raises(ValueError):
@@ -277,7 +295,7 @@ def fake_fstat(*args):
 
         try:
             hyper.http11.connection.os.fstat = fake_fstat
-            c = HTTP11Connection('http2bin.org')
+            c = HTTP11Connection('httpbin.org')
             c._sock = DummySocket()
 
             f = DummyFile(b'')
@@ -290,7 +308,7 @@ def fake_fstat(*args):
             hyper.http11.connection.os.fstat = old_fstat
 
     def test_request_with_unicode_generator_body(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = DummySocket()
         def body():
             yield u'hi'
@@ -301,7 +319,7 @@ def body():
             c.request('POST', '/post', body=body())
 
     def test_content_length_overrides_generator_unicode(self):
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
         c._sock = DummySocket()
         def body():
             yield u'hi'

test_release.py

@@ -90,7 +90,7 @@ def test_hitting_http2bin_org_http11(self):
         """
         This test function uses hyper's HTTP/1.1 support to talk to http2bin
         """
-        c = HTTP11Connection('http2bin.org')
+        c = HTTP11Connection('httpbin.org')
 
         # Here are some nice URLs.
         urls = [