Python 2/3 compat, minor test improvements

edenhill · edenhill · commit 3b4f3fb7ae71 · 2018-05-21T12:10:08.000+02:00
diff --git a/confluent_kafka/__init__.py b/confluent_kafka/__init__.py
@@ -281,7 +281,7 @@ def _make_topics_result(f, futmap):
         """
         try:
             result = f.result()
-            for topic, error in result.iteritems():
+            for topic, error in result.items():
                 fut = futmap.get(topic, None)
                 if fut is None:
                     raise RuntimeError("Topic {} not found in future-map: {}".format(topic, futmap))
@@ -294,7 +294,7 @@ def _make_topics_result(f, futmap):
                     fut.set_result(None)
         except Exception as e:
             # Request-level exception, raise the same for all topics
-            for topic, fut in futmap.iteritems():
+            for topic, fut in futmap.items():
                 fut.set_exception(e)
 
     @staticmethod
@@ -305,7 +305,7 @@ def _make_resource_result(f, futmap):
         """
         try:
             result = f.result()
-            for resource, configs in result.iteritems():
+            for resource, configs in result.items():
                 fut = futmap.get(resource, None)
                 if fut is None:
                     raise RuntimeError("Resource {} not found in future-map: {}".format(resource, futmap))
@@ -319,7 +319,7 @@ def _make_resource_result(f, futmap):
                     fut.set_result(configs)
         except Exception as e:
             # Request-level exception, raise the same for all resources
-            for resource, fut in futmap.iteritems():
+            for resource, fut in futmap.items():
                 fut.set_exception(e)
 
     @staticmethod
diff --git a/examples/adminapi.py b/examples/adminapi.py
@@ -35,7 +35,7 @@ def example_create_topics(a, topics):
     # Timeouts are preferably controlled by passing request_timeout=15.0
     # to the create_topics() call.
     # All futures will finish at the same time.
-    for topic, f in fs.iteritems():
+    for topic, f in fs.items():
         try:
             f.result()  # The result itself is None
             print("Topic {} created".format(topic))
@@ -55,7 +55,7 @@ def example_delete_topics(a, topics):
     fs = a.delete_topics(topics, operation_timeout=30)
 
     # Wait for operation to finish.
-    for topic, f in fs.iteritems():
+    for topic, f in fs.items():
         try:
             f.result()  # The result itself is None
             print("Topic {} deleted".format(topic))
@@ -74,7 +74,7 @@ def example_create_partitions(a, topics):
     fs = a.create_partitions(new_parts, validate_only=False)
 
     # Wait for operation to finish.
-    for topic, f in fs.iteritems():
+    for topic, f in fs.items():
         try:
             f.result()  # The result itself is None
             print("Additional partitions created for topic {}".format(topic))
@@ -101,7 +101,7 @@ def example_describe_configs(a, args):
     fs = a.describe_configs(resources)
 
     # Wait for operation to finish.
-    for res, f in fs.iteritems():
+    for res, f in fs.items():
         try:
             configs = f.result()
             for config in iter(configs.values()):
@@ -126,7 +126,7 @@ def example_alter_configs(a, args):
     fs = a.alter_configs(resources)
 
     # Wait for operation to finish.
-    for res, f in fs.iteritems():
+    for res, f in fs.items():
         try:
             f.result()  # empty, but raises exception on failure
             print("{} configuration successfully altered".format(res))
diff --git a/examples/integration_test.py b/examples/integration_test.py
@@ -509,6 +509,8 @@ def print_wmark(consumer, parts):
 
     example_headers = None
 
+    eof_reached = dict()
+
     while True:
         # Consume until EOF or error
 
@@ -521,7 +523,10 @@ def print_wmark(consumer, parts):
             if msg.error().code() == confluent_kafka.KafkaError._PARTITION_EOF:
                 print('Reached end of %s [%d] at offset %d' %
                       (msg.topic(), msg.partition(), msg.offset()))
-                break
+                eof_reached[(msg.topic(), msg.partition())] = True
+                if len(eof_reached) == len(c.assignment()):
+                    print('EOF reached for all assigned partitions: exiting')
+                    break
             else:
                 print('Consumer error: %s: ignoring' % msg.error())
                 break
@@ -928,7 +933,7 @@ def verify_topic_metadata(client, exp_topics):
 
         md = client.list_topics()
 
-        for exptopic, exppartcnt in exp_topics.iteritems():
+        for exptopic, exppartcnt in exp_topics.items():
             if exptopic not in md.topics:
                 print("Topic {} not yet reported in metadata: retrying".format(exptopic))
                 do_retry += 1
@@ -973,7 +978,7 @@ def verify_admin():
                              validate_only=validate,
                              operation_timeout=10.0)
 
-        for topic2, f in fs.iteritems():
+        for topic2, f in fs.items():
             f.result()  # trigger exception if there was an error
 
     #
@@ -989,7 +994,7 @@ def verify_admin():
                                                             new_total_count=num_partitions)],
                              operation_timeout=10.0)
 
-    for topic2, f in fs.iteritems():
+    for topic2, f in fs.items():
         f.result()  # trigger exception if there was an error
 
     #
@@ -1002,7 +1007,7 @@ def verify_config(expconfig, configs):
         Verify that the config key,values in expconfig are found
         and matches the ConfigEntry in configs.
         """
-        for key, expvalue in expconfig.iteritems():
+        for key, expvalue in expconfig.items():
             entry = configs.get(key, None)
             assert entry is not None, "Config {} not found in returned configs".format(key)
 
@@ -1025,7 +1030,7 @@ def verify_config(expconfig, configs):
     topic_config["file.delete.delay.ms"] = 12345
     topic_config["compression.type"] = "snappy"
 
-    for key, value in topic_config.iteritems():
+    for key, value in topic_config.items():
         resource.set_config(key, value)
 
     fs = a.alter_configs([resource])
