diff options
author | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:51 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:51 +0100 |
commit | 4dcb2435fc3fba64a0cdc8d2acd5038fc140da13 (patch) | |
tree | 71a258140096459b8499e35977a1d23686508657 /test | |
parent | 594e61c64780e4dd0bd91feab3a3afe56c4dbb2e (diff) | |
parent | 7aeaf9d4488d57c012cd1252ba5d0b2d6dcd1894 (diff) | |
download | mitmproxy-4dcb2435fc3fba64a0cdc8d2acd5038fc140da13.tar.gz mitmproxy-4dcb2435fc3fba64a0cdc8d2acd5038fc140da13.tar.bz2 mitmproxy-4dcb2435fc3fba64a0cdc8d2acd5038fc140da13.zip |
Merge remote-tracking branch 'origin/0.10' into 0.10
Diffstat (limited to 'test')
-rw-r--r-- | test/tservers.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/tservers.py b/test/tservers.py index 0606bd9c..eb3b91a4 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -2,11 +2,9 @@ import threading, Queue import flask import libpathod.test, libpathod.pathoc from libmproxy import proxy, flow, controller +from libmproxy.cmdline import APP_HOST, APP_PORT import tutils -APP_DOMAIN = "mitm" -APP_IP = "1.1.1.1" - testapp = flask.Flask(__name__) @testapp.route("/") @@ -31,7 +29,7 @@ class TestMaster(flow.FlowMaster): flow.FlowMaster.__init__(self, s, state) self.testq = testq self.clear_log() - self.start_app(APP_DOMAIN, APP_IP) + self.start_app(APP_HOST, APP_PORT, False) def handle_request(self, m): flow.FlowMaster.handle_request(self, m) |