Move pathod service testing truss to nose.

1 files changed, 14 insertions, 18 deletions

diff --git a/test/test_server.py b/test/test_server.py
index efd269eb..14c5fc88 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -1,31 +1,27 @@
-import urllib, urllib2
+import urllib, urllib2, unittest
 import libpathod.test, requests
 import tutils
 
-class uSanity(tutils.ProxTest):
+class Sanity(tutils.ProxTest):
     def test_http(self):
         assert self.pathod("205").status_code == 205
         assert self.log()
 
 
-class uProxy(tutils.ProxTest):
+class TestHTTP(Sanity):
+    pass
+
+
+class TestHTTPS(Sanity):
+    ssl = True
+
+
+class TestProxy(tutils.ProxTest):
     def test_http(self):
-        f = self._get()
-        assert f.code == 200
-        assert f.read()
-        f.close()
+        f = self.pathod("205")
+        assert f.status_code == 205
 
         l = self.log()
         assert l[0].address
         assert "host" in l[1].headers
-        assert l[2].code == 200
-
-
-tests = [
-    tutils.TestServer(), [
-        uSanity(),
-    ],
-    tutils.TestServer(ssl=True), [
-        uSanity(),
-    ],
-]
+        assert l[2].code == 205