diff --git a/test/functional/conftest.py b/test/functional/conftest.py index 8ef57c33..187c84f0 100644 --- a/test/functional/conftest.py +++ b/test/functional/conftest.py @@ -28,13 +28,9 @@ def docker_compose_file() -> str: """ if _running_in_travis_ci(): - print('Skipping') pytest.skip('Docker hub reports rate limit errors on pulls from Travis CI servers') - print('Failed to skip') - else: - print('Will not skip') - - print('PATH is ' + repr(os.getenv('PATH'))) + elif sys.platform != 'linux': + pytest.skip("No IPFS server build for Windows; Travis doesn't support Docker on mac") return str(TEST_DIR.joinpath('docker-compose.yml')) diff --git a/test/functional/test_auth.py b/test/functional/test_auth.py index 62a2d701..4d346a0f 100644 --- a/test/functional/test_auth.py +++ b/test/functional/test_auth.py @@ -1,12 +1,5 @@ -import pytest -import sys - -@pytest.mark.skipif( - sys.platform != 'linux', - reason="No IPFS server build for Windows; Travis doesn't support Docker on mac" -) def test_basic_auth(ipfs_service_client): """ Validate that client can connect to an IPFS api that is secured @@ -17,15 +10,3 @@ def test_basic_auth(ipfs_service_client): # Matches version in test/functional/docker-compose.yml assert response['Version'] == '0.8.0' - - -@pytest.mark.skip -def test_print_env(): - import os - - msg = '\n'.join(k + ': ' + os.environ.get(k) for k in sorted(os.environ.keys())) - - print('Environment:') - print(msg) - - assert False