3 files changed, 9 insertions, 59 deletions
diff --git a/test/test_authentication.py b/test/test_authentication.py
deleted file mode 100644
index f7a5ecd3..00000000
--- a/test/test_authentication.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import binascii
-from libmproxy import authentication
-from netlib import odict
-import tutils
-
-
-class TestNullProxyAuth:
-    def test_simple(self):
-        na = authentication.NullProxyAuth(authentication.PermissivePasswordManager())
-        assert not na.auth_challenge_headers()
-        assert na.authenticate("foo")
-        na.clean({})
-
-
-class TestBasicProxyAuth:
-    def test_simple(self):
-        ba = authentication.BasicProxyAuth(authentication.PermissivePasswordManager(), "test")
-        h = odict.ODictCaseless()
-        assert ba.auth_challenge_headers()
-        assert not ba.authenticate(h)
-
-    def test_parse_auth_value(self):
-        ba = authentication.BasicProxyAuth(authentication.PermissivePasswordManager(), "test")
-        vals = ("basic", "foo", "bar")
-        assert ba.parse_auth_value(ba.unparse_auth_value(*vals)) == vals
-        tutils.raises(ValueError, ba.parse_auth_value, "")
-        tutils.raises(ValueError, ba.parse_auth_value, "foo bar")
-
-        v = "basic " + binascii.b2a_base64("foo")
-        tutils.raises(ValueError, ba.parse_auth_value, v)
-
-    def test_authenticate_clean(self):
-        ba = authentication.BasicProxyAuth(authentication.PermissivePasswordManager(), "test")
-
-        hdrs = odict.ODictCaseless()
-        vals = ("basic", "foo", "bar")
-        hdrs[ba.AUTH_HEADER] = [ba.unparse_auth_value(*vals)]
-        assert ba.authenticate(hdrs)
-
-        ba.clean(hdrs)
-        assert not ba.AUTH_HEADER in hdrs
-
-
-        hdrs[ba.AUTH_HEADER] = [""]
-        assert not ba.authenticate(hdrs)
-
-        hdrs[ba.AUTH_HEADER] = ["foo"]
-        assert not ba.authenticate(hdrs)
-
-        vals = ("foo", "foo", "bar")
-        hdrs[ba.AUTH_HEADER] = [ba.unparse_auth_value(*vals)]
-        assert not ba.authenticate(hdrs)
-
-        ba = authentication.BasicProxyAuth(authentication.PasswordManager(), "test")
-        vals = ("basic", "foo", "bar")
-        hdrs[ba.AUTH_HEADER] = [ba.unparse_auth_value(*vals)]
-        assert not ba.authenticate(hdrs)
-
diff --git a/test/test_proxy.py b/test/test_proxy.py
index 0788edbf..2babe51c 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -58,3 +58,11 @@ class TestServerConnection:
         sc.connection.close = mock.Mock(side_effect=IOError)
         sc.terminate()
 
+
+class TestProcessOptions:
+    def test_auth(self):
+        parser = mock.MagicMock()
+        
+
+
+
diff --git a/test/test_server.py b/test/test_server.py
index 3a1b019f..0af4bae8 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -132,7 +132,7 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin):
     def test_invalid_headers(self):
         p = self.pathoc()
         req = p.request("get:'http://foo':h':foo'='bar'")
-        print req
+        assert req.status_code == 400
 
 
 class TestHTTPConnectSSLError(tservers.HTTPProxTest):