diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2018-05-06 18:37:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 18:37:24 +0200 |
| commit | 2a0da34a0c55918fdb50ead4c34c5ea1801a7779 (patch) | |
| tree | 66b46aa76d03e3e61778e1f26c0b4d6d44d1e19c | |
| parent | 44d788ff96187a353af908bba64f3b5cb75d6233 (diff) | |
| parent | 752a3674369230568a03e3acb1c40ac69e934463 (diff) | |
| download | mitmproxy-2a0da34a0c55918fdb50ead4c34c5ea1801a7779.tar.gz mitmproxy-2a0da34a0c55918fdb50ead4c34c5ea1801a7779.tar.bz2 mitmproxy-2a0da34a0c55918fdb50ead4c34c5ea1801a7779.zip | |
Merge pull request #3103 from mhils/fix-processing
Remove leftover processing_complete
| -rw-r--r-- | mitmproxy/addons/readfile.py | 1 | ||||
| -rw-r--r-- | test/mitmproxy/addons/test_readfile.py | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mitmproxy/addons/readfile.py b/mitmproxy/addons/readfile.py index b0a279ba..2b9ac2df 100644 --- a/mitmproxy/addons/readfile.py +++ b/mitmproxy/addons/readfile.py @@ -74,7 +74,6 @@ class ReadFile: raise exceptions.OptionsError(e) from e finally: self.is_reading = False - ctx.master.addons.trigger("processing_complete") def running(self): if ctx.options.rfile: diff --git a/test/mitmproxy/addons/test_readfile.py b/test/mitmproxy/addons/test_readfile.py index 62f4d917..3d28d8b7 100644 --- a/test/mitmproxy/addons/test_readfile.py +++ b/test/mitmproxy/addons/test_readfile.py @@ -1,6 +1,5 @@ import asyncio import io -from unittest import mock import pytest import asynctest @@ -110,8 +109,7 @@ class TestReadFileStdin: await rf.load_flows(stdin.buffer) @pytest.mark.asyncio - @mock.patch('mitmproxy.master.Master.load_flow') - async def test_normal(self, load_flow, tmpdir, data): + async def test_normal(self, tmpdir, data): rf = readfile.ReadFileStdin() with taddons.context(rf) as tctx: tf = tmpdir.join("tfile") |