aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_test.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_test.py')
-rw-r--r--test/test_test.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_test.py b/test/test_test.py
index 753d26f7..d26ce07b 100644
--- a/test/test_test.py
+++ b/test/test_test.py
@@ -1,8 +1,8 @@
-import time, logging
+import logging
import requests
-from libpathod import test, utils
+from libpathod import test
import tutils
-
+from requests.packages.urllib3.exceptions import ProtocolError
logging.disable(logging.CRITICAL)
class TestDaemonManual:
@@ -11,7 +11,7 @@ class TestDaemonManual:
rsp = requests.get("http://localhost:%s/p/202:da"%d.port)
assert rsp.ok
assert rsp.status_code == 202
- tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port)
+ tutils.raises(ProtocolError, requests.get, "http://localhost:%s/p/202:da"%d.port)
def test_startstop_ssl(self):
d = test.Daemon(ssl=True)
@@ -19,7 +19,7 @@ class TestDaemonManual:
assert rsp.ok
assert rsp.status_code == 202
d.shutdown()
- tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port)
+ tutils.raises(ProtocolError, requests.get, "http://localhost:%s/p/202:da"%d.port)
def test_startstop_ssl_explicit(self):
ssloptions = dict(
@@ -32,6 +32,6 @@ class TestDaemonManual:
assert rsp.ok
assert rsp.status_code == 202
d.shutdown()
- tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port)
+ tutils.raises(ProtocolError, requests.get, "http://localhost:%s/p/202:da"%d.port)