diff options
| author | Jesson Soto Ventura <jessonsotoventura@gmail.com> | 2019-09-24 23:40:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 23:40:28 -0400 |
| commit | b7e259029466fc7ac8e2dbd0f8d10086ef688952 (patch) | |
| tree | 6c62e628d34c837c18538aad98a10de4e1d46332 /test | |
| parent | c02d515b2aada5aa63439c6f2d71ae86a7c4dc6b (diff) | |
| parent | a08c22dcdd5535dcef453f7c1c2445c11f35beda (diff) | |
| download | mitmproxy-b7e259029466fc7ac8e2dbd0f8d10086ef688952.tar.gz mitmproxy-b7e259029466fc7ac8e2dbd0f8d10086ef688952.tar.bz2 mitmproxy-b7e259029466fc7ac8e2dbd0f8d10086ef688952.zip | |
Merge branch 'master' into tabular
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/addons/test_view.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/net/http/test_encoding.py | 1 | ||||
| -rw-r--r-- | test/mitmproxy/script/test_concurrent.py | 26 |
3 files changed, 15 insertions, 14 deletions
diff --git a/test/mitmproxy/addons/test_view.py b/test/mitmproxy/addons/test_view.py index 976c14b7..f5088a68 100644 --- a/test/mitmproxy/addons/test_view.py +++ b/test/mitmproxy/addons/test_view.py @@ -471,7 +471,7 @@ def test_focus(): v = view.View() v.add([tft()]) f = view.Focus(v) - assert f.index is 0 + assert f.index == 0 assert f.flow is v[0] # Start empty diff --git a/test/mitmproxy/net/http/test_encoding.py b/test/mitmproxy/net/http/test_encoding.py index 8dac12cb..7f768f39 100644 --- a/test/mitmproxy/net/http/test_encoding.py +++ b/test/mitmproxy/net/http/test_encoding.py @@ -19,6 +19,7 @@ def test_identity(encoder): 'gzip', 'br', 'deflate', + 'zstd', ]) def test_encoders(encoder): """ diff --git a/test/mitmproxy/script/test_concurrent.py b/test/mitmproxy/script/test_concurrent.py index 3ec58760..70d41511 100644 --- a/test/mitmproxy/script/test_concurrent.py +++ b/test/mitmproxy/script/test_concurrent.py @@ -43,17 +43,17 @@ class TestConcurrent(tservers.MasterTest): assert await tctx.master.await_log("decorator not supported") def test_concurrent_class(self, tdata): - with taddons.context() as tctx: - sc = tctx.script( - tdata.path( - "mitmproxy/data/addonscripts/concurrent_decorator_class.py" - ) + with taddons.context() as tctx: + sc = tctx.script( + tdata.path( + "mitmproxy/data/addonscripts/concurrent_decorator_class.py" ) - f1, f2 = tflow.tflow(), tflow.tflow() - tctx.cycle(sc, f1) - tctx.cycle(sc, f2) - start = time.time() - while time.time() - start < 5: - if f1.reply.state == f2.reply.state == "committed": - return - raise ValueError("Script never acked") + ) + f1, f2 = tflow.tflow(), tflow.tflow() + tctx.cycle(sc, f1) + tctx.cycle(sc, f2) + start = time.time() + while time.time() - start < 5: + if f1.reply.state == f2.reply.state == "committed": + return + raise ValueError("Script never acked") |