diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-10-20 22:25:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 22:25:17 +0200 |
| commit | 58ecef258b9b5fdc8335cc629a5d9ca61590a785 (patch) | |
| tree | 8eaeb7080143d61a120921ae44e900b9556aacf1 /test/conftest.py | |
| parent | bf67c734ea135838d9ea1e089f3018d013130ef8 (diff) | |
| parent | 4522f15c890e89f7a1ace243b2c1cbbaf76c5671 (diff) | |
| download | mitmproxy-58ecef258b9b5fdc8335cc629a5d9ca61590a785.tar.gz mitmproxy-58ecef258b9b5fdc8335cc629a5d9ca61590a785.tar.bz2 mitmproxy-58ecef258b9b5fdc8335cc629a5d9ca61590a785.zip | |
Merge pull request #2596 from mhils/fix-travis
Skip ipv6 tests on sudo-enabled travis builds
Diffstat (limited to 'test/conftest.py')
| -rw-r--r-- | test/conftest.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/conftest.py b/test/conftest.py index b0842bc3..27918cf9 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,4 +1,6 @@ import os +import socket + import pytest pytest_plugins = ('test.full_coverage_plugin',) @@ -17,3 +19,17 @@ skip_appveyor = pytest.mark.skipif( "APPVEYOR" in os.environ, reason='Skipping due to Appveyor' ) + +try: + s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + s.bind(("::1", 0)) + s.close() +except OSError: + no_ipv6 = True +else: + no_ipv6 = False + +skip_no_ipv6 = pytest.mark.skipif( + no_ipv6, + reason='Host has no IPv6 support' +) |