Make integration test warming more intuitive

1 files changed, 86 insertions, 91 deletions

diff --git a/test/test_integration.py b/test/test_integration.py
index 9ad58db..5a22630 100644
--- a/test/test_integration.py
+++ b/test/test_integration.py
@@ -12,6 +12,11 @@ from kafka.consumer import MAX_FETCH_BUFFER_SIZE_BYTES
 from .fixtures import ZookeeperFixture, KafkaFixture
 
 
+def random_string(l):
+    s = "".join(random.choice(string.letters) for i in xrange(l))
+    return s
+
+
 def ensure_topic_creation(client, topic_name):
     times = 0
     while True:
@@ -28,8 +33,8 @@ def ensure_topic_creation(client, topic_name):
 
 class KafkaTestCase(unittest.TestCase):
     def setUp(self):
-        topic_name = self.id()[self.id().rindex(".")+1:]
-        ensure_topic_creation(self.client, topic_name)
+        self.topic = "%s-%s" % (self.id()[self.id().rindex(".")+1:], random_string(10))
+        ensure_topic_creation(self.client, self.topic)
 
 
 class TestKafkaClient(KafkaTestCase):
@@ -51,7 +56,7 @@ class TestKafkaClient(KafkaTestCase):
 
     def test_produce_many_simple(self):
 
-        produce = ProduceRequest("test_produce_many_simple", 0, messages=[
+        produce = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message %d" % i) for i in range(100)
         ])
 
@@ -59,25 +64,25 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_many_simple", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 100)
 
         for resp in self.client.send_produce_request([produce]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 100)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_many_simple", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 200)
 
         for resp in self.client.send_produce_request([produce]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 200)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_many_simple", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 300)
 
     def test_produce_10k_simple(self):
-        produce = ProduceRequest("test_produce_10k_simple", 0, messages=[
+        produce = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message %d" % i) for i in range(10000)
         ])
 
@@ -85,7 +90,7 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_10k_simple", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 10000)
 
     def test_produce_many_gzip(self):
@@ -94,13 +99,13 @@ class TestKafkaClient(KafkaTestCase):
         message1 = create_gzip_message(["Gzipped 1 %d" % i for i in range(100)])
         message2 = create_gzip_message(["Gzipped 2 %d" % i for i in range(100)])
 
-        produce = ProduceRequest("test_produce_many_gzip", 0, messages=[message1, message2])
+        produce = ProduceRequest(self.topic, 0, messages=[message1, message2])
 
         for resp in self.client.send_produce_request([produce]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_many_gzip", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 200)
 
     def test_produce_many_snappy(self):
@@ -109,13 +114,13 @@ class TestKafkaClient(KafkaTestCase):
         message1 = create_snappy_message(["Snappy 1 %d" % i for i in range(100)])
         message2 = create_snappy_message(["Snappy 2 %d" % i for i in range(100)])
 
-        produce = ProduceRequest("test_produce_many_snappy", 0, messages=[message1, message2])
+        produce = ProduceRequest(self.topic, 0, messages=[message1, message2])
 
         for resp in self.client.send_produce_request([produce]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_many_snappy", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 200)
 
     def test_produce_mixed(self):
@@ -125,17 +130,17 @@ class TestKafkaClient(KafkaTestCase):
         message2 = create_gzip_message(["Gzipped %d" % i for i in range(100)])
         message3 = create_snappy_message(["Snappy %d" % i for i in range(100)])
 
-        produce = ProduceRequest("test_produce_mixed", 0, messages=[message1, message2, message3])
+        produce = ProduceRequest(self.topic, 0, messages=[message1, message2, message3])
 
         for resp in self.client.send_produce_request([produce]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_mixed", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 201)
 
     def test_produce_100k_gzipped(self):
-        req1 = ProduceRequest("test_produce_100k_gzipped", 0, messages=[
+        req1 = ProduceRequest(self.topic, 0, messages=[
             create_gzip_message(["Gzipped batch 1, message %d" % i for i in range(50000)])
         ])
 
@@ -143,10 +148,10 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_100k_gzipped", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 50000)
 
-        req2 = ProduceRequest("test_produce_100k_gzipped", 0, messages=[
+        req2 = ProduceRequest(self.topic, 0, messages=[
             create_gzip_message(["Gzipped batch 2, message %d" % i for i in range(50000)])
         ])
 
@@ -154,7 +159,7 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 50000)
 
-        (offset, ) = self.client.send_offset_request([OffsetRequest("test_produce_100k_gzipped", 0, -1, 1)])
+        (offset, ) = self.client.send_offset_request([OffsetRequest(self.topic, 0, -1, 1)])
         self.assertEquals(offset.offsets[0], 100000)
 
     #####################
@@ -162,18 +167,18 @@ class TestKafkaClient(KafkaTestCase):
     #####################
 
     def test_consume_none(self):
-        fetch = FetchRequest("test_consume_none", 0, 0, 1024)
+        fetch = FetchRequest(self.topic, 0, 0, 1024)
 
         fetch_resp = self.client.send_fetch_request([fetch])[0]
         self.assertEquals(fetch_resp.error, 0)
-        self.assertEquals(fetch_resp.topic, "test_consume_none")
+        self.assertEquals(fetch_resp.topic, self.topic)
         self.assertEquals(fetch_resp.partition, 0)
 
         messages = list(fetch_resp.messages)
         self.assertEquals(len(messages), 0)
 
     def test_produce_consume(self):
-        produce = ProduceRequest("test_produce_consume", 0, messages=[
+        produce = ProduceRequest(self.topic, 0, messages=[
             create_message("Just a test message"),
             create_message("Message with a key", "foo"),
         ])
@@ -182,7 +187,7 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        fetch = FetchRequest("test_produce_consume", 0, 0, 1024)
+        fetch = FetchRequest(self.topic, 0, 0, 1024)
 
         fetch_resp = self.client.send_fetch_request([fetch])[0]
         self.assertEquals(fetch_resp.error, 0)
@@ -197,7 +202,7 @@ class TestKafkaClient(KafkaTestCase):
         self.assertEquals(messages[1].message.key, "foo")
 
     def test_produce_consume_many(self):
-        produce = ProduceRequest("test_produce_consume_many", 0, messages=[
+        produce = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message %d" % i) for i in range(100)
         ])
 
@@ -206,7 +211,7 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(resp.offset, 0)
 
         # 1024 is not enough for 100 messages...
-        fetch1 = FetchRequest("test_produce_consume_many", 0, 0, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 0, 1024)
 
         (fetch_resp1,) = self.client.send_fetch_request([fetch1])
 
@@ -216,7 +221,7 @@ class TestKafkaClient(KafkaTestCase):
         self.assertTrue(len(messages) < 100)
 
         # 10240 should be enough
-        fetch2 = FetchRequest("test_produce_consume_many", 0, 0, 10240)
+        fetch2 = FetchRequest(self.topic, 0, 0, 10240)
         (fetch_resp2,) = self.client.send_fetch_request([fetch2])
 
         self.assertEquals(fetch_resp2.error, 0)
@@ -229,10 +234,10 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(message.message.key, None)
 
     def test_produce_consume_two_partitions(self):
-        produce1 = ProduceRequest("test_produce_consume_two_partitions", 0, messages=[
+        produce1 = ProduceRequest(self.topic, 0, messages=[
             create_message("Partition 0 %d" % i) for i in range(10)
         ])
-        produce2 = ProduceRequest("test_produce_consume_two_partitions", 1, messages=[
+        produce2 = ProduceRequest(self.topic, 1, messages=[
             create_message("Partition 1 %d" % i) for i in range(10)
         ])
 
@@ -240,8 +245,8 @@ class TestKafkaClient(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        fetch1 = FetchRequest("test_produce_consume_two_partitions", 0, 0, 1024)
-        fetch2 = FetchRequest("test_produce_consume_two_partitions", 1, 0, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 0, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 0, 1024)
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1, fetch2])
         self.assertEquals(fetch_resp1.error, 0)
         self.assertEquals(fetch_resp1.highwaterMark, 10)
@@ -266,11 +271,11 @@ class TestKafkaClient(KafkaTestCase):
 
     @unittest.skip('commmit offset not supported in this version')
     def test_commit_fetch_offsets(self):
-        req = OffsetCommitRequest("test_commit_fetch_offsets", 0, 42, "metadata")
+        req = OffsetCommitRequest(self.topic, 0, 42, "metadata")
         (resp,) = self.client.send_offset_commit_request("group", [req])
         self.assertEquals(resp.error, 0)
 
-        req = OffsetFetchRequest("test_commit_fetch_offsets", 0)
+        req = OffsetFetchRequest(self.topic, 0)
         (resp,) = self.client.send_offset_fetch_request("group", [req])
         self.assertEquals(resp.error, 0)
         self.assertEquals(resp.offset, 42)
@@ -279,7 +284,7 @@ class TestKafkaClient(KafkaTestCase):
     # Producer Tests
 
     def test_simple_producer(self):
-        producer = SimpleProducer(self.client, "test_simple_producer")
+        producer = SimpleProducer(self.client, self.topic)
         resp = producer.send_messages("one", "two")
 
         # Will go to partition 0
@@ -293,8 +298,8 @@ class TestKafkaClient(KafkaTestCase):
         self.assertEquals(resp[0].error, 0)
         self.assertEquals(resp[0].offset, 0)    # offset of first msg
 
-        fetch1 = FetchRequest("test_simple_producer", 0, 0, 1024)
-        fetch2 = FetchRequest("test_simple_producer", 1, 0, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 0, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 0, 1024)
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1,
                                                                    fetch2])
         self.assertEquals(fetch_resp1.error, 0)
@@ -318,15 +323,15 @@ class TestKafkaClient(KafkaTestCase):
         producer.stop()
 
     def test_round_robin_partitioner(self):
-        producer = KeyedProducer(self.client, "test_round_robin_partitioner",
+        producer = KeyedProducer(self.client, self.topic,
                                  partitioner=RoundRobinPartitioner)
         producer.send("key1", "one")
         producer.send("key2", "two")
         producer.send("key3", "three")
         producer.send("key4", "four")
 
-        fetch1 = FetchRequest("test_round_robin_partitioner", 0, 0, 1024)
-        fetch2 = FetchRequest("test_round_robin_partitioner", 1, 0, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 0, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 0, 1024)
 
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1,
                                                                    fetch2])
@@ -352,15 +357,15 @@ class TestKafkaClient(KafkaTestCase):
         producer.stop()
 
     def test_hashed_partitioner(self):
-        producer = KeyedProducer(self.client, "test_hashed_partitioner",
+        producer = KeyedProducer(self.client, self.topic,
                                  partitioner=HashedPartitioner)
         producer.send(1, "one")
         producer.send(2, "two")
         producer.send(3, "three")
         producer.send(4, "four")
 
-        fetch1 = FetchRequest("test_hashed_partitioner", 0, 0, 1024)
-        fetch2 = FetchRequest("test_hashed_partitioner", 1, 0, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 0, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 0, 1024)
 
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1,
                                                                    fetch2])
@@ -386,12 +391,12 @@ class TestKafkaClient(KafkaTestCase):
         producer.stop()
 
     def test_acks_none(self):
-        producer = SimpleProducer(self.client, "test_acks_none",
+        producer = SimpleProducer(self.client, self.topic,
                                   req_acks=SimpleProducer.ACK_NOT_REQUIRED)
         resp = producer.send_messages("one")
         self.assertEquals(len(resp), 0)
 
-        fetch = FetchRequest("test_acks_none", 0, 0, 1024)
+        fetch = FetchRequest(self.topic, 0, 0, 1024)
         fetch_resp = self.client.send_fetch_request([fetch])
 
         self.assertEquals(fetch_resp[0].error, 0)
@@ -405,12 +410,12 @@ class TestKafkaClient(KafkaTestCase):
         producer.stop()
 
     def test_acks_local_write(self):
-        producer = SimpleProducer(self.client, "test_acks_local_write",
+        producer = SimpleProducer(self.client, self.topic,
                                   req_acks=SimpleProducer.ACK_AFTER_LOCAL_WRITE)
         resp = producer.send_messages("one")
         self.assertEquals(len(resp), 1)
 
-        fetch = FetchRequest("test_acks_local_write", 0, 0, 1024)
+        fetch = FetchRequest(self.topic, 0, 0, 1024)
         fetch_resp = self.client.send_fetch_request([fetch])
 
         self.assertEquals(fetch_resp[0].error, 0)
@@ -425,12 +430,12 @@ class TestKafkaClient(KafkaTestCase):
 
     def test_acks_cluster_commit(self):
         producer = SimpleProducer(
-            self.client, "test_acks_cluster_commit",
+            self.client, self.topic,
             req_acks=SimpleProducer.ACK_AFTER_CLUSTER_COMMIT)
         resp = producer.send_messages("one")
         self.assertEquals(len(resp), 1)
 
-        fetch = FetchRequest("test_acks_cluster_commit", 0, 0, 1024)
+        fetch = FetchRequest(self.topic, 0, 0, 1024)
         fetch_resp = self.client.send_fetch_request([fetch])
 
         self.assertEquals(fetch_resp[0].error, 0)
@@ -444,16 +449,14 @@ class TestKafkaClient(KafkaTestCase):
         producer.stop()
 
     def test_async_simple_producer(self):
-        producer = SimpleProducer(self.client, "test_async_simple_producer",
-                                  async=True)
-
+        producer = SimpleProducer(self.client, self.topic, async=True)
         resp = producer.send_messages("one")
         self.assertEquals(len(resp), 0)
 
         # Give it some time
         time.sleep(2)
 
-        fetch = FetchRequest("test_async_simple_producer", 0, 0, 1024)
+        fetch = FetchRequest(self.topic, 0, 0, 1024)
         fetch_resp = self.client.send_fetch_request([fetch])
 
         self.assertEquals(fetch_resp[0].error, 0)
@@ -467,8 +470,7 @@ class TestKafkaClient(KafkaTestCase):
         producer.stop()
 
     def test_async_keyed_producer(self):
-        producer = KeyedProducer(self.client, "test_async_keyed_producer",
-                                 async=True)
+        producer = KeyedProducer(self.client, self.topic, async=True)
 
         resp = producer.send("key1", "one")
         self.assertEquals(len(resp), 0)
@@ -476,7 +478,7 @@ class TestKafkaClient(KafkaTestCase):
         # Give it some time
         time.sleep(2)
 
-        fetch = FetchRequest("test_async_keyed_producer", 0, 0, 1024)
+        fetch = FetchRequest(self.topic, 0, 0, 1024)
         fetch_resp = self.client.send_fetch_request([fetch])
 
         self.assertEquals(fetch_resp[0].error, 0)
@@ -490,7 +492,7 @@ class TestKafkaClient(KafkaTestCase):
         producer.stop()
 
     def test_batched_simple_producer(self):
-        producer = SimpleProducer(self.client, "test_batched_simple_producer",
+        producer = SimpleProducer(self.client, self.topic,
                                   batch_send=True,
                                   batch_send_every_n=10,
                                   batch_send_every_t=20)
@@ -505,8 +507,8 @@ class TestKafkaClient(KafkaTestCase):
         # Give it some time
         time.sleep(2)
 
-        fetch1 = FetchRequest("test_batched_simple_producer", 0, 0, 1024)
-        fetch2 = FetchRequest("test_batched_simple_producer", 1, 0, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 0, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 0, 1024)
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1,
                                                                    fetch2])
 
@@ -525,8 +527,8 @@ class TestKafkaClient(KafkaTestCase):
         # Give it some time
         time.sleep(2)
 
-        fetch1 = FetchRequest("test_batched_simple_producer", 0, 0, 1024)
-        fetch2 = FetchRequest("test_batched_simple_producer", 1, 0, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 0, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 0, 1024)
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1,
                                                                    fetch2])
 
@@ -544,8 +546,8 @@ class TestKafkaClient(KafkaTestCase):
         msgs = ["message-%d" % i for i in range(15, 17)]
         resp = producer.send_messages(*msgs)
 
-        fetch1 = FetchRequest("test_batched_simple_producer", 0, 5, 1024)
-        fetch2 = FetchRequest("test_batched_simple_producer", 1, 5, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 5, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 5, 1024)
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1,
                                                                    fetch2])
 
@@ -557,8 +559,8 @@ class TestKafkaClient(KafkaTestCase):
         # Give it some time
         time.sleep(22)
 
-        fetch1 = FetchRequest("test_batched_simple_producer", 0, 5, 1024)
-        fetch2 = FetchRequest("test_batched_simple_producer", 1, 5, 1024)
+        fetch1 = FetchRequest(self.topic, 0, 5, 1024)
+        fetch2 = FetchRequest(self.topic, 1, 5, 1024)
         fetch_resp1, fetch_resp2 = self.client.send_fetch_request([fetch1,
                                                                    fetch2])
 
@@ -587,7 +589,7 @@ class TestConsumer(KafkaTestCase):
 
     def test_simple_consumer(self):
         # Produce 100 messages to partition 0
-        produce1 = ProduceRequest("test_simple_consumer", 0, messages=[
+        produce1 = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message 0 %d" % i) for i in range(100)
         ])
 
@@ -596,7 +598,7 @@ class TestConsumer(KafkaTestCase):
             self.assertEquals(resp.offset, 0)
 
         # Produce 100 messages to partition 1
-        produce2 = ProduceRequest("test_simple_consumer", 1, messages=[
+        produce2 = ProduceRequest(self.topic, 1, messages=[
             create_message("Test message 1 %d" % i) for i in range(100)
         ])
 
@@ -606,7 +608,7 @@ class TestConsumer(KafkaTestCase):
 
         # Start a consumer
         consumer = SimpleConsumer(self.client, "group1",
-                                  "test_simple_consumer", auto_commit=False,
+                                  self.topic, auto_commit=False,
                                   iter_timeout=0)
         all_messages = []
         for message in consumer:
@@ -634,7 +636,7 @@ class TestConsumer(KafkaTestCase):
 
     def test_simple_consumer_blocking(self):
         consumer = SimpleConsumer(self.client, "group1",
-                                  "test_simple_consumer_blocking",
+                                  self.topic,
                                   auto_commit=False, iter_timeout=0)
 
         # Blocking API
@@ -645,7 +647,7 @@ class TestConsumer(KafkaTestCase):
         self.assertEqual(len(messages), 0)
 
         # Send 10 messages
-        produce = ProduceRequest("test_simple_consumer_blocking", 0, messages=[
+        produce = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message 0 %d" % i) for i in range(10)
         ])
 
@@ -669,21 +671,21 @@ class TestConsumer(KafkaTestCase):
     def test_simple_consumer_pending(self):
         # Produce 10 messages to partition 0 and 1
 
-        produce1 = ProduceRequest("test_simple_consumer_pending", 0, messages=[
+        produce1 = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message 0 %d" % i) for i in range(10)
         ])
         for resp in self.client.send_produce_request([produce1]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        produce2 = ProduceRequest("test_simple_consumer_pending", 1, messages=[
+        produce2 = ProduceRequest(self.topic, 1, messages=[
             create_message("Test message 1 %d" % i) for i in range(10)
         ])
         for resp in self.client.send_produce_request([produce2]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        consumer = SimpleConsumer(self.client, "group1", "test_simple_consumer_pending",
+        consumer = SimpleConsumer(self.client, "group1", self.topic,
                                   auto_commit=False, iter_timeout=0)
         self.assertEquals(consumer.pending(), 20)
         self.assertEquals(consumer.pending(partitions=[0]), 10)
@@ -692,7 +694,7 @@ class TestConsumer(KafkaTestCase):
 
     def test_multi_process_consumer(self):
         # Produce 100 messages to partition 0
-        produce1 = ProduceRequest("test_multi_process_consumer", 0, messages=[
+        produce1 = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message 0 %d" % i) for i in range(100)
         ])
 
@@ -701,7 +703,7 @@ class TestConsumer(KafkaTestCase):
             self.assertEquals(resp.offset, 0)
 
         # Produce 100 messages to partition 1
-        produce2 = ProduceRequest("test_multi_process_consumer", 1, messages=[
+        produce2 = ProduceRequest(self.topic, 1, messages=[
             create_message("Test message 1 %d" % i) for i in range(100)
         ])
 
@@ -710,7 +712,7 @@ class TestConsumer(KafkaTestCase):
             self.assertEquals(resp.offset, 0)
 
         # Start a consumer
-        consumer = MultiProcessConsumer(self.client, "grp1", "test_multi_process_consumer", auto_commit=False)
+        consumer = MultiProcessConsumer(self.client, "grp1", self.topic, auto_commit=False)
         all_messages = []
         for message in consumer:
             all_messages.append(message)
@@ -727,7 +729,7 @@ class TestConsumer(KafkaTestCase):
         self.assertEqual(len(messages), 0)
 
         # Send 10 messages
-        produce = ProduceRequest("test_multi_process_consumer", 0, messages=[
+        produce = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message 0 %d" % i) for i in range(10)
         ])
 
@@ -750,7 +752,7 @@ class TestConsumer(KafkaTestCase):
 
     def test_multi_proc_pending(self):
         # Produce 10 messages to partition 0 and 1
-        produce1 = ProduceRequest("test_multi_proc_pending", 0, messages=[
+        produce1 = ProduceRequest(self.topic, 0, messages=[
             create_message("Test message 0 %d" % i) for i in range(10)
         ])
 
@@ -758,7 +760,7 @@ class TestConsumer(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        produce2 = ProduceRequest("test_multi_proc_pending", 1, messages=[
+        produce2 = ProduceRequest(self.topic, 1, messages=[
             create_message("Test message 1 %d" % i) for i in range(10)
         ])
 
@@ -766,7 +768,7 @@ class TestConsumer(KafkaTestCase):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 0)
 
-        consumer = MultiProcessConsumer(self.client, "group1", "test_multi_proc_pending", auto_commit=False)
+        consumer = MultiProcessConsumer(self.client, "group1", self.topic, auto_commit=False)
         self.assertEquals(consumer.pending(), 20)
         self.assertEquals(consumer.pending(partitions=[0]), 10)
         self.assertEquals(consumer.pending(partitions=[1]), 10)
@@ -776,7 +778,7 @@ class TestConsumer(KafkaTestCase):
     def test_large_messages(self):
         # Produce 10 "normal" size messages
         messages1 = [create_message(random_string(1024)) for i in range(10)]
-        produce1 = ProduceRequest("test_large_messages", 0, messages1)
+        produce1 = ProduceRequest(self.topic, 0, messages1)
 
         for resp in self.client.send_produce_request([produce1]):
             self.assertEquals(resp.error, 0)
@@ -784,14 +786,14 @@ class TestConsumer(KafkaTestCase):
 
         # Produce 10 messages that are large (bigger than default fetch size)
         messages2 = [create_message(random_string(5000)) for i in range(10)]
-        produce2 = ProduceRequest("test_large_messages", 0, messages2)
+        produce2 = ProduceRequest(self.topic, 0, messages2)
 
         for resp in self.client.send_produce_request([produce2]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 10)
 
         # Consumer should still get all of them
-        consumer = SimpleConsumer(self.client, "group1", "test_large_messages",
+        consumer = SimpleConsumer(self.client, "group1", self.topic,
                                   auto_commit=False, iter_timeout=0)
         all_messages = messages1 + messages2
         for i, message in enumerate(consumer):
@@ -801,7 +803,7 @@ class TestConsumer(KafkaTestCase):
         # Produce 1 message that is too large (bigger than max fetch size)
         big_message_size = MAX_FETCH_BUFFER_SIZE_BYTES + 10
         big_message = create_message(random_string(big_message_size))
-        produce3 = ProduceRequest("test_large_messages", 0, [big_message])
+        produce3 = ProduceRequest(self.topic, 0, [big_message])
         for resp in self.client.send_produce_request([produce3]):
             self.assertEquals(resp.error, 0)
             self.assertEquals(resp.offset, 20)
@@ -809,7 +811,7 @@ class TestConsumer(KafkaTestCase):
         self.assertRaises(ConsumerFetchSizeTooSmall, consumer.get_message, False, 0.1)
 
         # Create a consumer with no fetch size limit
-        big_consumer = SimpleConsumer(self.client, "group1", "test_large_messages",
+        big_consumer = SimpleConsumer(self.client, "group1", self.topic,
                                       max_buffer_size=None, partitions=[0],
                                       auto_commit=False, iter_timeout=0)
 
@@ -843,8 +845,7 @@ class TestFailover(KafkaTestCase):
         self.zk.close()
 
     def test_switch_leader(self):
-
-        key, topic, partition = random_string(5), 'test_switch_leader', 0
+        key, topic, partition = random_string(5), self.topic, 0
         producer = SimpleProducer(self.client, topic)
 
         for i in range(1, 4):
@@ -875,8 +876,7 @@ class TestFailover(KafkaTestCase):
         producer.stop()
 
     def test_switch_leader_async(self):
-
-        key, topic, partition = random_string(5), 'test_switch_leader_async', 0
+        key, topic, partition = random_string(5), self.topic, 0
         producer = SimpleProducer(self.client, topic, async=True)
 
         for i in range(1, 4):
@@ -927,11 +927,6 @@ class TestFailover(KafkaTestCase):
         client.close()
         return len(all_messages)
 
-
-def random_string(l):
-    s = "".join(random.choice(string.letters) for i in xrange(l))
-    return s
-
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)
     unittest.main()