Merge branch 'master' into 0.10

4 files changed, 14 insertions, 8 deletions

diff --git a/test/test_dump.py b/test/test_dump.py
index ccfa9189..255651a9 100644
--- a/test/test_dump.py
+++ b/test/test_dump.py
@@ -107,6 +107,12 @@ class TestDumpMaster:
     def test_filter(self):
         assert not "GET" in self._dummy_cycle(1, "~u foo", "", verbosity=1)
 
+    def test_app(self):
+        o = dump.Options(app=True)
+        s = mock.MagicMock()
+        m = dump.DumpMaster(s, o, None)
+        assert s.apps.add.call_count == 2
+
     def test_replacements(self):
         o = dump.Options(replacements=[(".*", "content", "foo")])
         m = dump.DumpMaster(None, o, None)
diff --git a/test/test_flow.py b/test/test_flow.py
index eacd7c25..9844e0fd 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -600,7 +600,7 @@ class TestFlowMaster:
         s = flow.State()
         fm = flow.FlowMaster(None, s)
         f = tutils.tflow_full()
-        fm.load_flow(f)
+        f = fm.load_flow(f)
         assert s.flow_count() == 1
         f2 = fm.duplicate_flow(f)
         assert f2.response
diff --git a/test/test_proxy.py b/test/test_proxy.py
index ed47dbac..dfccaaf7 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -56,7 +56,7 @@ class TestServerConnection:
         sc = proxy.ServerConnection(proxy.ProxyConfig(), "http", self.d.IFACE, self.d.port, "host.com")
         sc.connect()
         sc.connection = mock.Mock()
-        sc.connection.close = mock.Mock(side_effect=IOError)
+        sc.connection.flush = mock.Mock(side_effect=tcp.NetLibDisconnect)
         sc.terminate()
 
 
@@ -116,9 +116,6 @@ class TestProcessProxyOptions:
             self.assert_noerr("--client-certs", confdir)
             self.assert_err("directory does not exist", "--client-certs", "nonexistent")
 
-            self.assert_noerr("--dummy-certs", confdir)
-            self.assert_err("directory does not exist", "--dummy-certs", "nonexistent")
-
     def test_auth(self):
         p = self.assert_noerr("--nonanonymous")
         assert p.authenticator
diff --git a/test/tservers.py b/test/tservers.py
index 1197fb69..0606bd9c 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -4,6 +4,9 @@ import libpathod.test, libpathod.pathoc
 from libmproxy import proxy, flow, controller
 import tutils
 
+APP_DOMAIN = "mitm"
+APP_IP = "1.1.1.1"
+
 testapp = flask.Flask(__name__)
 
 @testapp.route("/")
@@ -28,6 +31,7 @@ class TestMaster(flow.FlowMaster):
         flow.FlowMaster.__init__(self, s, state)
         self.testq = testq
         self.clear_log()
+        self.start_app(APP_DOMAIN, APP_IP)
 
     def handle_request(self, m):
         flow.FlowMaster.handle_request(self, m)
@@ -85,7 +89,6 @@ class ProxTestBase:
             no_upstream_cert = cls.no_upstream_cert,
             cacert = tutils.test_data.path("data/serverkey.pem"),
             authenticator = cls.authenticator,
-            app = True,
             **pconf
         )
         tmaster = cls.masterclass(cls.tqueue, config)
@@ -162,12 +165,12 @@ class HTTPProxTest(ProxTestBase):
         if self.ssl:
             p = libpathod.pathoc.Pathoc("127.0.0.1", self.proxy.port, True)
             print "PRE"
-            p.connect((proxy.APP_IP, 80))
+            p.connect((APP_IP, 80))
             print "POST"
             return p.request("get:'/%s'"%page)
         else:
             p = self.pathoc()
-            return p.request("get:'http://%s/%s'"%(proxy.APP_DOMAIN, page))
+            return p.request("get:'http://%s/%s'"%(APP_DOMAIN, page))
 
 
 class TResolver: