Skip to content

Commit a473b29

Browse files
committed
Use skip instead of conditional yield for ci check
1 parent 6c87c50 commit a473b29

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

test/functional/conftest.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@ def _running_in_travis_ci() -> bool:
6060

6161

6262
@pytest.fixture(scope='session')
63-
def ipfs_service_auth() -> ty.Generator[ty.Tuple[str, str], None, None]:
64-
if not _running_in_travis_ci():
65-
# Docker pull hits docker hub rate limits when running on Travis CI; avoiding the
66-
# rate limit requires a Docker Hub account.
67-
#
68-
# Conditionally skip all tests using the docker-compose container if running in CI.
69-
yield 'TheUser', 'ThePassword'
63+
def ipfs_service_auth() -> ty.Tuple[str, str]:
64+
if _running_in_travis_ci():
65+
pytest.skip('Docker hub reports rate limit errors on pulls from Travis CI servers')
66+
67+
return 'TheUser', 'ThePassword'
7068

7169

7270
@pytest.fixture(scope="function")

0 commit comments

Comments
 (0)