diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 17:25:59 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 17:25:59 +0100 |
| commit | 0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043 (patch) | |
| tree | 8f80e441b68bba052f4e91d4ac44e43297a8750f /test/test_dump.py | |
| parent | 6c24b1d0d2c3a2860d427e84e30d6022b6500320 (diff) | |
| parent | 5acbef236c503bf973a5782dd0139efa977824ea (diff) | |
| download | mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.tar.gz mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.tar.bz2 mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.zip | |
merge master
Diffstat (limited to 'test/test_dump.py')
| -rw-r--r-- | test/test_dump.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test_dump.py b/test/test_dump.py index 9874b650..a958a2ec 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -153,7 +153,7 @@ class TestDumpMaster: def test_script(self): ret = self._dummy_cycle( 1, None, "", - scripts=[[tutils.test_data.path("scripts/all.py")]], verbosity=0, eventlog=True + scripts=[tutils.test_data.path("scripts/all.py")], verbosity=0, eventlog=True ) assert "XCLIENTCONNECT" in ret assert "XSERVERCONNECT" in ret @@ -162,11 +162,11 @@ class TestDumpMaster: assert "XCLIENTDISCONNECT" in ret tutils.raises( dump.DumpError, - self._dummy_cycle, 1, None, "", scripts=[["nonexistent"]] + self._dummy_cycle, 1, None, "", scripts=["nonexistent"] ) tutils.raises( dump.DumpError, - self._dummy_cycle, 1, None, "", scripts=[["starterr.py"]] + self._dummy_cycle, 1, None, "", scripts=["starterr.py"] ) def test_stickycookie(self): |