diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_flow.py | 10 | ||||
| -rw-r--r-- | test/mitmproxy/test_flow_format_compat.py | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py index 8729cc77..1d69a3f8 100644 --- a/test/mitmproxy/test_flow.py +++ b/test/mitmproxy/test_flow.py @@ -1,8 +1,5 @@ -from six.moves import queue -import time import os.path from six.moves import cStringIO as StringIO -import email.utils import mock @@ -10,6 +7,7 @@ import netlib.utils from netlib import odict from netlib.http import Headers from mitmproxy import filt, controller, tnetstring, flow +from mitmproxy.exceptions import FlowReadException from mitmproxy.models import Error from mitmproxy.models import Flow from mitmproxy.models import HTTPFlow @@ -727,10 +725,10 @@ class TestSerialize: sio.write("bogus") sio.seek(0) r = flow.FlowReader(sio) - tutils.raises(flow.FlowReadError, list, r.stream()) + tutils.raises(FlowReadException, list, r.stream()) - f = flow.FlowReadError("foo") - assert f.strerror == "foo" + f = FlowReadException("foo") + assert str(f) == "foo" def test_versioncheck(self): f = tutils.tflow() diff --git a/test/mitmproxy/test_flow_format_compat.py b/test/mitmproxy/test_flow_format_compat.py index 7a0694e1..2c477cc2 100644 --- a/test/mitmproxy/test_flow_format_compat.py +++ b/test/mitmproxy/test_flow_format_compat.py @@ -1,4 +1,4 @@ -from mitmproxy.flow import FlowReader, FlowReadError +from mitmproxy.flow import FlowReader, FlowReadException from . import tutils @@ -13,5 +13,5 @@ def test_load(): def test_cannot_convert(): with open(tutils.test_data.path("data/dumpfile-012"), "rb") as f: flow_reader = FlowReader(f) - with tutils.raises(FlowReadError): + with tutils.raises(FlowReadException): list(flow_reader.stream()) |