aboutsummaryrefslogtreecommitdiffstats
path: root/test/pathod/test_pathod.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-07-25 21:57:54 +0200
committerGitHub <noreply@github.com>2017-07-25 21:57:54 +0200
commitd409a6c09a873c8131c5e6938aea496904f324c3 (patch)
tree99d7c442043e1cf4105a8b95f2494ed81a07b53c /test/pathod/test_pathod.py
parent3262b6e70510e3fd78c512ee79fcb8eb35d371ba (diff)
parent4855659eebfe7b2ea965daced88879277b75439c (diff)
downloadmitmproxy-d409a6c09a873c8131c5e6938aea496904f324c3.tar.gz
mitmproxy-d409a6c09a873c8131c5e6938aea496904f324c3.tar.bz2
mitmproxy-d409a6c09a873c8131c5e6938aea496904f324c3.zip
Merge pull request #2469 from Kriechi/nuke-old-openssl
nuke old openssl
Diffstat (limited to 'test/pathod/test_pathod.py')
-rw-r--r--test/pathod/test_pathod.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py
index 88480a59..5f191c0d 100644
--- a/test/pathod/test_pathod.py
+++ b/test/pathod/test_pathod.py
@@ -8,7 +8,6 @@ from mitmproxy import exceptions
from mitmproxy.test import tutils
from . import tservers
-from ..conftest import requires_alpn
class TestPathod:
@@ -257,11 +256,6 @@ class TestHTTP2(tservers.DaemonTests):
ssl = True
nohang = True
- @requires_alpn
def test_http2(self):
r, _ = self.pathoc(["GET:/"], ssl=True, use_http2=True)
assert r[0].status_code == 800
-
- def test_no_http2(self, disable_alpn):
- with pytest.raises(NotImplementedError):
- r, _ = self.pathoc(["GET:/"], ssl=True, use_http2=True)