diff options
author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-02-02 17:23:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-02 17:23:11 +0100 |
commit | 3f4d472c80f707b3ffbc060123d811c6bcae2afd (patch) | |
tree | 465ed866617e3d613078f1a682ff4eb5018c43f1 /test/pathod/test_language_http2.py | |
parent | c1bc1ea584d4bb47c1b754dfa7f10ab4dfc380a3 (diff) | |
parent | 4f0b2bc4dec4eb3c4f0075bcebebeb126a5a6e88 (diff) | |
download | mitmproxy-3f4d472c80f707b3ffbc060123d811c6bcae2afd.tar.gz mitmproxy-3f4d472c80f707b3ffbc060123d811c6bcae2afd.tar.bz2 mitmproxy-3f4d472c80f707b3ffbc060123d811c6bcae2afd.zip |
Merge pull request #1980 from Kriechi/improve-tests
improve tests
Diffstat (limited to 'test/pathod/test_language_http2.py')
-rw-r--r-- | test/pathod/test_language_http2.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/pathod/test_language_http2.py b/test/pathod/test_language_http2.py index 8ab1acae..fdb65a63 100644 --- a/test/pathod/test_language_http2.py +++ b/test/pathod/test_language_http2.py @@ -1,4 +1,5 @@ import io +import pytest from mitmproxy.net import tcp from mitmproxy.net.http import user_agents @@ -7,8 +8,6 @@ from pathod import language from pathod.language import http2 from pathod.protocols.http2 import HTTP2StateProtocol -from mitmproxy.test import tutils - def parse_request(s): return next(language.parse_pathoc(s, True)) @@ -40,10 +39,12 @@ class TestRequest: assert req.values(default_settings()) == req.values(default_settings()) def test_nonascii(self): - tutils.raises("ascii", parse_request, "get:\xf0") + with pytest.raises("ascii"): + parse_request("get:\xf0") def test_err(self): - tutils.raises(language.ParseException, parse_request, 'GET') + with pytest.raises(language.ParseException): + parse_request('GET') def test_simple(self): r = parse_request('GET:"/foo"') @@ -167,10 +168,12 @@ class TestResponse: assert res.values(default_settings()) == res.values(default_settings()) def test_nonascii(self): - tutils.raises("ascii", parse_response, "200:\xf0") + with pytest.raises("ascii"): + parse_response("200:\xf0") def test_err(self): - tutils.raises(language.ParseException, parse_response, 'GET:/') + with pytest.raises(language.ParseException): + parse_response('GET:/') def test_raw_content_length(self): r = parse_response('200:r') |