Enh: updated tests to be less strict / more robust.

Grégory Starck · Grégory Starck · commit cd44d9e324be · 2015-04-27T12:59:46.000-04:00
We had spurious/random test failures with travis because there had other warnings generated. (see for instance: https://travis-ci.org/savoirfairelinux/influxdb-python/jobs/59929464) Unfortunately we couldn't reproduce. So this just changed the assert to be less strict: search for the expected message/warning in the rec_warnings list. example of the failure: ====================================================================== FAIL: Tests warning for an invalid bulk size. ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/travis/build/savoirfairelinux/influxdb-python/tests/influxdb/influxdb08/helper_test.py", line 172, in testWarnBulkSizeZero .format(WarnBulkSizeZero, '\n'.join(map(str, w)))) nose.proxy.AssertionError: 5 != 1 : <class 'tests.influxdb.influxdb08.helper_test.WarnBulkSizeZero'> call should have generated one warning.Actual generated warnings: {message : UserWarning('Definition of bulk_size in WarnBulkSizeZero forced to 1, was less than 1.',), category : 'UserWarning', filename : '/home/travis/build/savoirfairelinux/influxdb-python/influxdb/influxdb08/helper.py', lineno : 79, line : None} {message : ResourceWarning('unclosed <socket.socket object at 0x0000000005c63820>',), category : 'ResourceWarning', filename : '/home/travis/build/savoirfairelinux/influxdb-python/.tox/pypy3/lib-python/3/os.py', lineno : 477, line : None} {message : ResourceWarning('unclosed <socket.socket object at 0x0000000005e1ace0>',), category : 'ResourceWarning', filename : '/home/travis/build/savoirfairelinux/influxdb-python/.tox/pypy3/lib-python/3/os.py', lineno : 477, line : None} {message : ResourceWarning('unclosed <socket.socket object at 0x0000000005e1b100>',), category : 'ResourceWarning', filename : '/home/travis/build/savoirfairelinux/influxdb-python/.tox/pypy3/lib-python/3/os.py', lineno : 477, line : None} {message : ResourceWarning('unclosed <socket.socket object at 0x0000000005e1b130>',), category : 'ResourceWarning', filename : '/home/travis/build/savoirfairelinux/influxdb-python/.tox/pypy3/lib-python/3/os.py', lineno : 477, line : None}
diff --git a/tests/influxdb/influxdb08/helper_test.py b/tests/influxdb/influxdb08/helper_test.py
@@ -158,19 +158,26 @@ class Meta:
                 bulk_size = 0
                 autocommit = True
 
-        with warnings.catch_warnings(record=True) as w:
+        with warnings.catch_warnings(record=True) as rec_warnings:
             warnings.simplefilter("always")
-            try:
+            # Server defined in the client is invalid, we're testing
+            # the warning only.
+            with self.assertRaises(ConnectionError):
                 WarnBulkSizeZero(time=159, server_name='us.east-1')
-            except ConnectionError:
-                # Server defined in the client is invalid, we're testing
-                # the warning only.
-                pass
-            self.assertEqual(len(w), 1,
-                             '{} call should have generated one warning.'
-                             .format(WarnBulkSizeZero))
-            self.assertIn('forced to 1', str(w[-1].message),
-                          'Warning message did not contain "forced to 1".')
+
+        self.assertGreaterEqual(
+            len(rec_warnings), 1,
+            '{} call should have generated one warning.'
+            'Actual generated warnings: {}'.format(
+                WarnBulkSizeZero, '\n'.join(map(str, rec_warnings))))
+
+        expected_msg = (
+            'Definition of bulk_size in WarnBulkSizeZero forced to 1, '
+            'was less than 1.')
+
+        self.assertIn(expected_msg, list(w.message.args[0]
+                                         for w in rec_warnings),
+                      'Warning message did not contain "forced to 1".')
 
     def testWarnBulkSizeNoEffect(self):
         """
@@ -184,11 +191,24 @@ class Meta:
                 bulk_size = 5
                 autocommit = False
 
-        with warnings.catch_warnings(record=True) as w:
+        with warnings.catch_warnings(record=True) as rec_warnings:
             warnings.simplefilter("always")
             WarnBulkSizeNoEffect(time=159, server_name='us.east-1')
-            self.assertEqual(len(w), 1,
-                             '{} call should have generated one warning.'
-                             .format(WarnBulkSizeNoEffect))
-            self.assertIn('has no affect', str(w[-1].message),
-                          'Warning message did not contain "has not affect".')
+
+        self.assertGreaterEqual(
+            len(rec_warnings), 1,
+            '{} call should have generated one warning.'
+            'Actual generated warnings: {}'.format(
+                WarnBulkSizeNoEffect, '\n'.join(map(str, rec_warnings))))
+
+        expected_msg = (
+            'Definition of bulk_size in WarnBulkSizeNoEffect has no affect '
+            'because autocommit is false.')
+
+        self.assertIn(expected_msg, list(w.message.args[0]
+                                         for w in rec_warnings),
+                      'Warning message did not contain the expected_msg.')
+
+
+if __name__ == '__main__':
+    unittest.main()
