bustage fix so that monkeypatches in test_transaction_executor puts t…

…ime.sleep back to what it was, r=twobraids

socorro/unittest/cron/testWeeklyReportsPartitions.py

@@ -1,3 +1,4 @@
+import unittest
 import psycopg2
 from psycopg2.extensions import TRANSACTION_STATUS_IDLE
 from socorro.app.generic_app import main
@@ -23,7 +24,7 @@
 }
 
 
-class TestClass:
+class TestClass(unittest.TestCase):
 
     def setUp(self):
         assert 'test' in databaseName.default, databaseName.default
@@ -66,4 +67,4 @@ def test_run_weeklyReportsPartitions(self):
         # check that something was written to the mock_bucket
         cursor = self.conn.cursor()
         cursor.execute('select count(*) from mock_bucket;')
-        assert cursor.fetchone()
+        self.assertTrue(cursor.fetchone())

socorro/unittest/database/testTransactionExecutor.py

@@ -225,15 +225,20 @@ def mock_sleep(n):
                 _sleep_count.append(n)
 
             # monkey patch the sleep function from inside transaction_executor
+            _orig_sleep = socorro.database.transaction_executor.time.sleep
             socorro.database.transaction_executor.time.sleep = mock_sleep
 
-            executor(mock_function)
-            self.assertTrue(_function_calls)
-            self.assertEqual(commit_count, 1)
-            self.assertEqual(rollback_count, 0)
-            self.assertTrue(mock_logging.warnings)
-            self.assertEqual(len(mock_logging.warnings), 5)
-            self.assertTrue(len(_sleep_count) > 10)
+            try:
+                executor(mock_function)
+                self.assertTrue(_function_calls)
+                self.assertEqual(commit_count, 1)
+                self.assertEqual(rollback_count, 0)
+                self.assertTrue(mock_logging.warnings)
+                self.assertEqual(len(mock_logging.warnings), 5)
+                self.assertTrue(len(_sleep_count) > 10)
+            finally:
+                socorro.database.transaction_executor.time.sleep = _orig_sleep
+
 
     def test_operation_error_with_postgres_with_backoff_with_rollback(self):
         required_config = Namespace()
@@ -277,13 +282,16 @@ def mock_sleep(n):
                 _sleep_count.append(n)
 
             # monkey patch the sleep function from inside transaction_executor
+            _orig_sleep = socorro.database.transaction_executor.time.sleep
             socorro.database.transaction_executor.time.sleep = mock_sleep
 
-            executor(mock_function)
-            self.assertTrue(_function_calls)
-            self.assertEqual(commit_count, 1)
-            self.assertEqual(rollback_count, 5)
-            self.assertTrue(mock_logging.warnings)
-            self.assertEqual(len(mock_logging.warnings), 5)
-            self.assertTrue(len(_sleep_count) > 10)
-
+            try:
+                executor(mock_function)
+                self.assertTrue(_function_calls)
+                self.assertEqual(commit_count, 1)
+                self.assertEqual(rollback_count, 5)
+                self.assertTrue(mock_logging.warnings)
+                self.assertEqual(len(mock_logging.warnings), 5)
+                self.assertTrue(len(_sleep_count) > 10)
+            finally:
+                socorro.database.transaction_executor.time.sleep = _orig_sleep