diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-06-17 16:48:06 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-06-17 16:48:06 +0200 |
| commit | d462b444b7eed04927e77d8971d4b218459fdee3 (patch) | |
| tree | 98cfc69daa13dfe1b647ea89d9364bcc8117d624 /test/test_dump.py | |
| parent | 84248d431bcad4a289f1ce82bf090da41970020b (diff) | |
| download | mitmproxy-d462b444b7eed04927e77d8971d4b218459fdee3.tar.gz mitmproxy-d462b444b7eed04927e77d8971d4b218459fdee3.tar.bz2 mitmproxy-d462b444b7eed04927e77d8971d4b218459fdee3.zip | |
update tests to reflect changes to options.scripts
Diffstat (limited to 'test/test_dump.py')
| -rw-r--r-- | test/test_dump.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/test_dump.py b/test/test_dump.py index 6a35cdec..ccfa9189 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -43,6 +43,7 @@ class TestDumpMaster: m = dump.DumpMaster(None, o, filt, outfile=cs) for i in range(n): self._cycle(m, content) + m.shutdown() return cs.getvalue() def _flowfile(self, path): @@ -143,7 +144,7 @@ class TestDumpMaster: def test_script(self): ret = self._dummy_cycle( 1, None, "", - script=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 "XREQUEST" in ret @@ -151,11 +152,11 @@ class TestDumpMaster: assert "XCLIENTDISCONNECT" in ret tutils.raises( dump.DumpError, - self._dummy_cycle, 1, None, "", script="nonexistent" + self._dummy_cycle, 1, None, "", scripts=[["nonexistent"]] ) tutils.raises( dump.DumpError, - self._dummy_cycle, 1, None, "", script="starterr.py" + self._dummy_cycle, 1, None, "", scripts=[["starterr.py"]] ) def test_stickycookie(self): |