Skip to content

Commit

Permalink
foo
Browse files Browse the repository at this point in the history
  • Loading branch information
c0llab0rat0r committed Jun 14, 2021
1 parent 5f9dc94 commit f65636e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 25 deletions.
8 changes: 2 additions & 6 deletions test/functional/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))

Expand Down
19 changes: 0 additions & 19 deletions test/functional/test_auth.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

0 comments on commit f65636e

Please sign in to comment.