Skip to content

Commit ce3b23f

Browse files
committed
fix test
1 parent dbfb224 commit ce3b23f

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

ghsearch/gh_search.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,11 @@ def _confirm_continue_near_limit(core_rate: Rate, num_results: int, calls_per_re
4040
)
4141

4242

43-
def _echo_rate_limits(rate_limit: RateLimit | None) -> None:
44-
if rate_limit is None:
45-
click.echo("(Rate limiting is disabled)")
46-
else:
47-
core = rate_limit.core
48-
search = rate_limit.search
49-
click.echo(
50-
f"Core rate limit: {core.remaining}/{core.limit} (resets {core.reset}), "
51-
f"Search rate limit: {search.remaining}/{search.limit} (resets {search.reset})"
52-
)
43+
def _echo_rate_limits(rate_limit: RateLimit) -> None:
44+
click.echo(
45+
f"Core rate limit: {rate_limit.core.remaining}/{rate_limit.core.limit} (resets {rate_limit.core.reset}), "
46+
f"Search rate limit: {rate_limit.search.remaining}/{rate_limit.search.limit} (resets {rate_limit.search.reset})"
47+
)
5348

5449

5550
class GHSearch:
@@ -70,7 +65,7 @@ def get_rate_limit(self) -> RateLimit | None:
7065
def get_filtered_results(self, query: List[str]) -> List[ContentFile]:
7166
rate_limit = self.get_rate_limit()
7267

73-
if self.verbose:
68+
if rate_limit and self.verbose:
7469
_echo_rate_limits(rate_limit)
7570

7671
results = self.client.search_code(query=" ".join(query))
@@ -92,8 +87,8 @@ def get_filtered_results(self, query: List[str]) -> List[ContentFile]:
9287
elif self.verbose:
9388
click.echo(f"Skipping result for {result.repository.full_name} via {exclude_reason}")
9489

95-
if self.verbose:
96-
rate_limit = self.get_rate_limit()
90+
rate_limit = self.get_rate_limit()
91+
if rate_limit and self.verbose:
9792
_echo_rate_limits(rate_limit)
9893

9994
return filtered_results

tests/unit/gh_search_test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ def test_get_filtered_results_many_calls(mock_client, mock_click):
129129
)
130130

131131

132-
def test_get_filtered_results_rate_limiting_disabled(mock_client, mock_click):
132+
def test_get_filtered_results_rate_limiting_disabled(mock_client):
133133
mock_client.get_rate_limit.side_effect = github.GithubException(404, "Not Found")
134-
mock_client.search_code.return_value = MockPaginatedList(*[], total_count=0)
135134
mock_filter = Mock()
136135
mock_filter.uses_core_api = True
137136

138-
ghsearch = GHSearch(mock_client, [mock_filter], True)
137+
ghsearch = GHSearch(mock_client, [])
139138
ghsearch.get_filtered_results(["query", "org:bort"])
140139

141-
mock_click.echo.assert_any_call("(Rate limiting is disabled)")
140+
# ensure get_rate_limit was called (and the side_effect above handled)
141+
mock_client.get_rate_limit.assert_called()

0 commit comments

Comments
 (0)