aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMarcelo Glezer <mg@tekii.com.ar>2015-02-05 11:25:22 -0300
committerMarcelo Glezer <mg@tekii.com.ar>2015-02-05 11:25:22 -0300
commit17ee88e07e68e19e24fd0a85b0e1d5723fd19338 (patch)
treeab68843e42e06335f71d842eb71f70d89167c0fb /test
parent5e2f440cdd860ee74696b0db639c6baf87dd945a (diff)
parent0ac3227b7bb27a76b6f49aa1605f1b1887a01a10 (diff)
downloadmitmproxy-17ee88e07e68e19e24fd0a85b0e1d5723fd19338.tar.gz
mitmproxy-17ee88e07e68e19e24fd0a85b0e1d5723fd19338.tar.bz2
mitmproxy-17ee88e07e68e19e24fd0a85b0e1d5723fd19338.zip
Merge remote-tracking branch 'base/master'
Diffstat (limited to 'test')
-rw-r--r--test/test_dump.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test_dump.py b/test/test_dump.py
index 69df912f..11a024e3 100644
--- a/test/test_dump.py
+++ b/test/test_dump.py
@@ -75,7 +75,7 @@ class TestDumpMaster:
def test_replay(self):
cs = StringIO()
- o = dump.Options(server_replay="nonexistent", kill=True)
+ o = dump.Options(server_replay=["nonexistent"], kill=True)
tutils.raises(dump.DumpError, dump.DumpMaster, None, o, outfile=cs)
with tutils.tmpdir() as t: