From d0ee4d60d09c607a208ae1b190e619a4f106538e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 5 Jan 2013 19:44:12 -0800
Subject: Unit tests and minor code refactoring for ServerConnection.

---
 test/test_server.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'test/test_server.py')

diff --git a/test/test_server.py b/test/test_server.py
index 38d33d90..ba263e96 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -1,4 +1,5 @@
 from netlib import tcp
+from libpathod import pathoc
 import tutils
 
 """
@@ -52,6 +53,20 @@ class TestHTTP(tutils.HTTPProxTest, SanityMixin):
         t.wfile.flush()
         assert "Bad Request" in t.rfile.readline()
 
+    def test_upstream_ssl_error(self):
+        p = self.pathoc()
+        ret = p.request("get:'https://localhost:%s/'"%self.server.port)
+        assert ret[1] == 400
+
+    def test_http(self):
+        f = self.pathod("304")
+        assert f.status_code == 304
+
+        l = self.master.state.view[0]
+        assert l.request.client_conn.address
+        assert "host" in l.request.headers
+        assert l.response.code == 304
+
 
 class TestHTTPS(tutils.HTTPProxTest, SanityMixin):
     ssl = True
@@ -65,12 +80,3 @@ class TestTransparent(tutils.TransparentProxTest, SanityMixin):
     transparent = True
 
 
-class TestProxy(tutils.HTTPProxTest):
-    def test_http(self):
-        f = self.pathod("304")
-        assert f.status_code == 304
-
-        l = self.master.state.view[0]
-        assert l.request.client_conn.address
-        assert "host" in l.request.headers
-        assert l.response.code == 304
-- 
cgit v1.2.3