Reenable the retry module and test it

mathom · mathom · commit b4abed658401 · 2014-10-15T13:19:51.000-05:00
diff --git a/stackify/http.py b/stackify/http.py
@@ -70,7 +70,7 @@ def POST(self, url, json_object, use_gzip=False):
             internal_log.exception('Cannot decode JSON response')
             raise
 
-    #@retrying.retry(wait_exponential_multiplier=1000, stop_max_delay=10000)
+    @retrying.retry(wait_exponential_multiplier=1000, stop_max_delay=10000)
     def identify_application(self):
         result = self.POST('/Metrics/IdentifyApp', self.environment_detail)
         self.app_name_id = result.get('AppNameID')
diff --git a/tests/test_http.py b/tests/test_http.py
@@ -4,21 +4,49 @@
 """
 
 import unittest
+import retrying
 from mock import patch, Mock
 
+retrying_mock = Mock()
+
 import stackify.http
 
+from stackify.application import ApiConfiguration
+
+
+old_retry = retrying.retry
+
+FAKE_RETRIES = 3
+
+def fake_retry(*args, **kwargs):
+    kwargs['wait_exponential_max'] = 0 # no delay between retries
+    kwargs['stop_max_attempt_number'] = FAKE_RETRIES # stop after 3 tries
+    def inner(func):
+        return old_retry(*args, **kwargs)(func)
+    return inner
+
 
 class TestClient(unittest.TestCase):
     '''
     Test the HTTP Client and associated utilities
     '''
 
-    def setUp(self):
-        pass
+    @classmethod
+    def setUpClass(cls):
+        retrying.retry = fake_retry
+        reload(stackify.http)
 
-    def tearDown(self):
-        pass
+    @classmethod
+    def tearDownClass(cls):
+        reload(retrying)
+        reload(stackify.http)
+
+    def setUp(self):
+        self.config = ApiConfiguration(
+            application = 'test_appname',
+            environment = 'test_environment',
+            api_key = 'test_apikey',
+            api_url = 'test_apiurl')
 
     def test_logger_no_config(self):
         '''GZIP encoder works'''
@@ -27,6 +55,19 @@ def test_logger_no_config(self):
         gzipped[4:8] = '    ' # blank the mtime
         self.assertEqual(gzipped, correct)
 
+    def test_identify_retrying(self):
+        '''HTTP identify should retry'''
+        client = stackify.http.HTTPClient(self.config)
+
+        class CustomException(Exception): pass
+        crash = Mock(side_effect=CustomException)
+
+        with patch.object(client, 'POST', crash):
+            with self.assertRaises(CustomException):
+                client.identify_application()
+        self.assertEqual(crash.call_count, FAKE_RETRIES)
+
+
 if __name__=='__main__':
     unittest.main()
 
