KAFKA-24599: revert deletion of test_kafka_consumer_offsets_for_time_old since it won't get run for our version anyway; increase timeout on assert_message_count to avoid test failures

Author: lennrt

test/test_consumer_integration.py

@@ -758,6 +758,15 @@ def test_kafka_consumer_offsets_search_many_partitions(kafka_consumer, kafka_pro
     }
 
 
+@pytest.mark.skipif(env_kafka_version() >= (0, 10, 1), reason="Requires KAFKA_VERSION < 0.10.1")
+def test_kafka_consumer_offsets_for_time_old(kafka_consumer, topic):
+    consumer = kafka_consumer
+    tp = TopicPartition(topic, 0)
+
+    with pytest.raises(UnsupportedVersionError):
+        consumer.offsets_for_times({tp: int(time.time())})
+
+
 @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,

test/test_failover_integration.py

@@ -208,7 +208,7 @@ def _kill_leader(self, topic, partition):
         broker.close()
         return broker
 
-    def assert_message_count(self, topic, check_count, timeout=10,
+    def assert_message_count(self, topic, check_count, timeout=25,
                              partitions=None, at_least=False):
         hosts = ','.join(['%s:%d' % (broker.host, broker.port)
                           for broker in self.brokers])