diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-28 01:51:13 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-28 01:51:13 +0200 |
| commit | 1cc48345e13917aadc1e0fd93d6011139e78e3d9 (patch) | |
| tree | 9758b20f95587104807fc74e545e35ec9a9cdef3 /test/test_flow.py | |
| parent | a86491eeed13c7889356e5102312f52bd86c3c66 (diff) | |
| download | mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.gz mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.bz2 mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.zip | |
clean up config/cmdline, fix bugs, remove cruft
Diffstat (limited to 'test/test_flow.py')
| -rw-r--r-- | test/test_flow.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/test_flow.py b/test/test_flow.py index 711688da..5c49deed 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -4,6 +4,7 @@ import os.path from cStringIO import StringIO import email.utils import mock +from libmproxy.cmdline import parse_server_spec import netlib.utils from netlib import odict @@ -672,11 +673,8 @@ class TestSerialize: s = flow.State() conf = ProxyConfig( mode="reverse", - upstream_server=[ - True, - True, - "use-this-domain", - 80]) + upstream_server=("https", ("use-this-domain", 80)) + ) fm = flow.FlowMaster(DummyServer(conf), s) fm.load_flows(r) assert s.flows[0].request.host == "use-this-domain" |