diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-07-24 10:32:56 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-07-24 10:32:56 +1200 |
| commit | 5c1157ddaf01b9245519d176469587aa6539ac5d (patch) | |
| tree | 064877904e9a52199f5a84ea6d465b544d7c71ad /test | |
| parent | 64ce3b358ffed2eb34d6836b57dd7849ce856a09 (diff) | |
| download | mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.tar.gz mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.tar.bz2 mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.zip | |
Move app instantiation out of proxy.py.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_dump.py | 6 | ||||
| -rw-r--r-- | test/tservers.py | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/test/test_dump.py b/test/test_dump.py index 6a35cdec..b195d5f0 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -106,6 +106,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/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: |