Skip to content

Commit 44a9e26

Browse files
committed
Bryans suggestions
1 parent 920704d commit 44a9e26

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

synapseclient/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ def login(
821821

822822
# Check version before logging in
823823
if not self.skip_checks:
824-
version_check()
824+
version_check(self.logger)
825825

826826
# Make sure to invalidate the existing session
827827
self.logout()

synapseclient/core/version_check.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,14 @@ def version_check(
6363
):
6464
return False
6565

66+
# Don't prevent the client from running if something goes wrong
6667
except Exception as e:
67-
# Don't prevent the client from running if something goes wrong
68-
sys.stderr.write(f"Exception in version check: {str(e)}\n")
68+
msg = f"Exception in version check: {str(e)}\n"
69+
if logger:
70+
logger.info(msg)
71+
else:
72+
sys.stdout.write(msg)
73+
sys.stdout.flush()
6974
return False
7075

7176
return True

tests/integration/synapseclient/core/test_version_check.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"""Integration tests for version checking"""
22

3+
import httpx
34
from pytest_mock import MockerFixture
45

5-
import synapseclient.core.version_check
66
from synapseclient.core.version_check import _get_version_info_from_pypi, version_check
77

88

@@ -14,8 +14,8 @@ async def test_version_check(mocker: MockerFixture):
1414
# Test out of date version
1515
assert not version_check(current_version="0.0.1")
1616

17-
# Assert _get_version_info_from_pypi called when running version_check
18-
spy = mocker.spy(synapseclient.core.version_check, "_get_version_info_from_pypi")
17+
# Assert httpx.get called when running version_check
18+
spy = mocker.spy(httpx, "get")
1919
version_check()
2020
spy.assert_called_once()
2121

0 commit comments

Comments
 (0)