diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-07-25 21:57:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 21:57:54 +0200 |
| commit | d409a6c09a873c8131c5e6938aea496904f324c3 (patch) | |
| tree | 99d7c442043e1cf4105a8b95f2494ed81a07b53c /test/conftest.py | |
| parent | 3262b6e70510e3fd78c512ee79fcb8eb35d371ba (diff) | |
| parent | 4855659eebfe7b2ea965daced88879277b75439c (diff) | |
| download | mitmproxy-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/conftest.py')
| -rw-r--r-- | test/conftest.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/test/conftest.py b/test/conftest.py index bb913548..b0842bc3 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,15 +1,8 @@ import os import pytest -import OpenSSL - -import mitmproxy.net.tcp pytest_plugins = ('test.full_coverage_plugin',) -requires_alpn = pytest.mark.skipif( - not mitmproxy.net.tcp.HAS_ALPN, - reason='requires OpenSSL with ALPN support') - skip_windows = pytest.mark.skipif( os.name == "nt", reason='Skipping due to Windows' @@ -24,9 +17,3 @@ skip_appveyor = pytest.mark.skipif( "APPVEYOR" in os.environ, reason='Skipping due to Appveyor' ) - - -@pytest.fixture() -def disable_alpn(monkeypatch): - monkeypatch.setattr(mitmproxy.net.tcp, 'HAS_ALPN', False) - monkeypatch.setattr(OpenSSL.SSL._lib, 'Cryptography_HAS_ALPN', False) |