Update Consumer and Producer test exception assertions with pytest.match

rnpridgeon · Ryan P · commit 52c31c6b5f33 · 2019-07-11T07:47:06.000-04:00
diff --git a/tests/test_Consumer.py b/tests/test_Consumer.py
@@ -226,7 +226,7 @@ def test_multiple_close_throw_exception():
 
     with pytest.raises(RuntimeError) as ex:
         c.close()
-    assert 'Consumer already closed' == str(ex.value)
+    assert ex.match('Consumer already closed')
 
 
 def test_any_method_after_close_throws_exception():
@@ -244,51 +244,51 @@ def test_any_method_after_close_throws_exception():
 
     with pytest.raises(RuntimeError) as ex:
         c.subscribe(['test'])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.unsubscribe()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.poll()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.consume()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.assign([TopicPartition('test', 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.unassign()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.assignment()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.commit()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.committed([TopicPartition("test", 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.position([TopicPartition("test", 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.seek([TopicPartition("test", 0, 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         lo, hi = c.get_watermark_offsets(TopicPartition("test", 0))
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
 
 @pytest.mark.skipif(libversion()[1] < 0x000b0000,
@@ -308,16 +308,16 @@ def test_calling_store_offsets_after_close_throws_erro():
 
     with pytest.raises(RuntimeError) as ex:
         c.store_offsets(offsets=[TopicPartition("test", 0, 42)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.offsets_for_times([TopicPartition("test", 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
 
 def test_consumer_withot_groupid():
     """ Consumer should raise exception if group.id is not set """
 
     with pytest.raises(ValueError) as ex:
         Consumer({'bootstrap.servers': "mybroker:9092"})
-    assert 'group.id must be set' in str(ex)
+    assert ex.match('group.id must be set')
diff --git a/tests/test_Producer.py b/tests/test_Producer.py
@@ -118,9 +118,9 @@ def test_produce_headers_should_fail():
                   'error_cb': error_cb,
                   'message.timeout.ms': 10})
 
-    with pytest.raises(NotImplementedError) as e:
+    with pytest.raises(NotImplementedError) as ex:
         p.produce('mytopic', value='somedata', key='a key', headers=[('headerkey', 'headervalue')])
-    assert 'Producer message headers requires confluent-kafka-python built for librdkafka version >=v0.11.4' in str(e)
+    assert ex.match('Producer message headers requires confluent-kafka-python built for librdkafka version >=v0.11.4')
 
 
 def test_subclassing():
@@ -188,6 +188,6 @@ def test_set_invalid_partitioner_murmur():
     """
     Assert invalid partitioner raises KafkaException
     """
-    with pytest.raises(KafkaException) as e:
+    with pytest.raises(KafkaException) as ex:
         Producer({'partitioner': 'murmur'})
-    assert 'Invalid value for configuration property "partitioner": murmur' in str(e)
+    assert ex.match('Invalid value for configuration property "partitioner": murmur')
