Test a difficult-to-trigger IOError, fix cert generation in test suite.

2 files changed, 10 insertions, 1 deletions

diff --git a/test/test_server.py b/test/test_server.py
index a2c65275..9df88400 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -1,4 +1,5 @@
 import socket, time
+import mock
 from netlib import tcp
 from libpathod import pathoc
 import tutils, tservers
@@ -97,6 +98,14 @@ class TestHTTP(tservers.HTTPProxTest, SanityMixin):
         assert p.request("get:'%s':h'Connection'='close'"%response)
         tutils.raises("disconnect", p.request, "get:'%s'"%response)
 
+    def test_proxy_ioerror(self):
+        # Tests a difficult-to-trigger condition, where an IOError is raised
+        # within our read loop.
+        with mock.patch("libmproxy.proxy.ProxyHandler.read_request") as m:
+            m.side_effect = IOError("error!")
+            tutils.raises("empty reply", self.pathod, "304")
+
+
 
 class TestHTTPS(tservers.HTTPProxTest, SanityMixin):
     ssl = True
diff --git a/test/tservers.py b/test/tservers.py
index ae0bacf5..262536a7 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -63,7 +63,7 @@ class ProxTestBase:
         cls.server = libpathod.test.Daemon(ssl=cls.ssl)
         pconf = cls.get_proxy_config()
         config = proxy.ProxyConfig(
-            certfile=tutils.test_data.path("data/testkey.pem"),
+            cacert = tutils.test_data.path("data/serverkey.pem"),
             **pconf
         )
         tmaster = cls.masterclass(cls.tqueue, config)