Skip to content

Commit f65636e

Browse files
committed
foo
1 parent 5f9dc94 commit f65636e

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

test/functional/conftest.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,9 @@ def docker_compose_file() -> str:
2828
"""
2929

3030
if _running_in_travis_ci():
31-
print('Skipping')
3231
pytest.skip('Docker hub reports rate limit errors on pulls from Travis CI servers')
33-
print('Failed to skip')
34-
else:
35-
print('Will not skip')
36-
37-
print('PATH is ' + repr(os.getenv('PATH')))
32+
elif sys.platform != 'linux':
33+
pytest.skip("No IPFS server build for Windows; Travis doesn't support Docker on mac")
3834

3935
return str(TEST_DIR.joinpath('docker-compose.yml'))
4036

test/functional/test_auth.py

-19
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11

2-
import pytest
3-
import sys
42

5-
6-
@pytest.mark.skipif(
7-
sys.platform != 'linux',
8-
reason="No IPFS server build for Windows; Travis doesn't support Docker on mac"
9-
)
103
def test_basic_auth(ipfs_service_client):
114
"""
125
Validate that client can connect to an IPFS api that is secured
@@ -17,15 +10,3 @@ def test_basic_auth(ipfs_service_client):
1710

1811
# Matches version in test/functional/docker-compose.yml
1912
assert response['Version'] == '0.8.0'
20-
21-
22-
@pytest.mark.skip
23-
def test_print_env():
24-
import os
25-
26-
msg = '\n'.join(k + ': ' + os.environ.get(k) for k in sorted(os.environ.keys()))
27-
28-
print('Environment:')
29-
print(msg)
30-
31-
assert False

0 commit comments

Comments
 (0)