From e9a838ae53a9388bc6695721cd2d446e750e64c6 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sun, 31 Aug 2014 01:28:51 +0200
Subject: [PATCH] fix tests to be compatible with the latest requests version

---
 requirements.txt  |  2 +-
 setup.py          |  2 +-
 test/test_test.py | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c8faa9e10..de91b65e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ Werkzeug>=0.9.4
 itsdangerous>=0.23
 pyOpenSSL>=0.13.1
 pyasn1>=0.1.7
-requests>=2.1.0
+requests>=2.4.0
 netlib>=0.10
\ No newline at end of file
diff --git a/setup.py b/setup.py
index a72cfe004..6b3f1330e 100644
--- a/setup.py
+++ b/setup.py
@@ -90,5 +90,5 @@ setup(
             "Topic :: Software Development :: Testing :: Traffic Generation",
             "Topic :: Internet :: WWW/HTTP",
         ],
-        install_requires=['netlib>=%s'%version.MINORVERSION, "requests>=1.1.0", "Flask>=0.10.1"]
+        install_requires=['netlib>=%s'%version.MINORVERSION, "requests>=2.4.0", "Flask>=0.10.1"]
 )
diff --git a/test/test_test.py b/test/test_test.py
index 753d26f71..d26ce07be 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)