Skip to content

Follow up to PR 1782 -- fix tests #1914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2019
Merged

Follow up to PR 1782 -- fix tests #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion kafka/consumer/fetcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ def _retrieve_offsets(self, timestamps, timeout_ms=float("inf")):

start_time = time.time()
remaining_ms = timeout_ms
timestamps = copy.copy(timestamps)
while remaining_ms > 0:
if not timestamps:
return {}
Expand All @@ -294,7 +295,7 @@ def _retrieve_offsets(self, timestamps, timeout_ms=float("inf")):
if refresh_future.succeeded() and isinstance(future.exception, Errors.StaleMetadata):
log.debug("Stale metadata was raised, and we now have an updated metadata. Rechecking partition existance")
unknown_partition = future.exception.args[0] # TopicPartition from StaleMetadata
if not self._client.cluster.leader_for_partition(unknown_partition):
if self._client.cluster.leader_for_partition(unknown_partition) is None:
log.debug("Removed partition %s from offsets retrieval" % (unknown_partition, ))
timestamps.pop(unknown_partition)
else:
Expand Down
5 changes: 2 additions & 3 deletions test/test_consumer_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,12 +766,11 @@ def test_kafka_consumer_offsets_for_time_old(kafka_consumer, topic):
@pytest.mark.skipif(env_kafka_version() < (0, 10, 1), reason="Requires KAFKA_VERSION >= 0.10.1")
def test_kafka_consumer_offsets_for_times_errors(kafka_consumer_factory, topic):
consumer = kafka_consumer_factory(fetch_max_wait_ms=200,
request_timeout_ms=500)
request_timeout_ms=500)
tp = TopicPartition(topic, 0)
bad_tp = TopicPartition(topic, 100)

with pytest.raises(ValueError):
consumer.offsets_for_times({tp: -1})

with pytest.raises(KafkaTimeoutError):
consumer.offsets_for_times({bad_tp: 0})
assert consumer.offsets_for_times({bad_tp: 0}) == {bad_tp: None}