Add abstraction test case for http upgrade

Author: fredthomsen

test/test_abstraction.py

@@ -2,7 +2,7 @@
 import hyper.common.connection
 
 from hyper.common.connection import HTTPConnection
-from hyper.common.exceptions import TLSUpgrade
+from hyper.common.exceptions import TLSUpgrade, HTTPUpgrade
 
 class TestHTTPConnection(object):
     def test_h1_kwargs(self):
@@ -31,7 +31,7 @@ def test_h2_kwargs(self):
             'other_kwarg': True,
         }
 
-    def test_upgrade(self, monkeypatch):
+    def test_tls_upgrade(self, monkeypatch):
         monkeypatch.setattr(
             hyper.common.connection, 'HTTP11Connection', DummyH1Connection
         )
@@ -46,23 +46,70 @@ def test_upgrade(self, monkeypatch):
 
         assert r == 'h2'
         assert isinstance(c._conn, DummyH2Connection)
-        assert c._conn._sock == 'totally a socket'
+        assert c._conn._sock == 'totally a secure socket'
+
+    def test_http_upgrade(self, monkeypatch):
+        monkeypatch.setattr(
+            hyper.common.connection, 'HTTP11Connection', DummyH1Connection
+        )
+        monkeypatch.setattr(
+            hyper.common.connection, 'HTTP20Connection', DummyH2Connection
+        )
+        c = HTTPConnection('test', 80)
+
+        assert isinstance(c._conn, DummyH1Connection)
+
+        c.request('GET', '/')
+        resp = c.get_response()
+
+        assert resp == 'h2c'
+        assert isinstance(c._conn, DummyH2Connection)
+        assert c._conn._sock == 'totally a non-secure socket'
 
 
 class DummyH1Connection(object):
-    def __init__(self, *args, **kwargs):
-        pass
+    def __init__(self,  host, port=None, secure=None, **kwargs):
+        self.host = host
+        self.port = port
+
+        if secure is not None:
+            self.secure = secure
+        elif self.port == 443:
+            self.secure = True
+        else:
+            self.secure = False
 
     def request(self, *args, **kwargs):
-        raise TLSUpgrade('h2', 'totally a socket')
+        if(self.secure):
+            raise TLSUpgrade('h2', 'totally a secure socket')
+
+    def get_response(self):
+        if(not self.secure):
+            raise HTTPUpgrade('h2c', 'totally a non-secure socket')
 
 
 class DummyH2Connection(object):
-    def __init__(self, *args, **kwargs):
-        pass
+    def __init__(self, host, port=None, secure=None, **kwargs):
+        self.host = host
+        self.port = port
+
+        if secure is not None:
+            self.secure = secure
+        elif self.port == 443:
+            self.secure = True
+        else:
+            self.secure = False
 
     def _send_preamble(self):
         pass
 
+    def _new_stream(self, *args, **kwargs):
+        pass
+
     def request(self, *args, **kwargs):
-        return 'h2'
+        if(self.secure):
+            return 'h2'
+
+    def get_response(self, *args, **kwargs):
+         if(not self.secure):
+            return 'h2c'

test_release.py

@@ -86,9 +86,9 @@ def test_hitting_http2bin_org(self):
         assert all(map(lambda r: r.status_code == 200, responses))
         assert all(map(lambda r: r.text, responses))
 
-    def test_hitting_http2bin_org_http11(self):
+    def test_hitting_httpbin_org_http11(self):
         """
-        This test function uses hyper's HTTP/1.1 support to talk to http2bin
+        This test function uses hyper's HTTP/1.1 support to talk to httpbin
         """
         c = HTTP11Connection('httpbin.org')