Merge pull request #40 from nvllsvm/cor

Fix exception when correlation_id is None

sprockets/mixins/http/__init__.py

@@ -454,7 +454,7 @@ def _http_req_apply_default_headers(self, request_headers, content_type,
             request_headers.setdefault(
                 'Content-Type',
                 str(content_type) or str(CONTENT_TYPE_MSGPACK))
-        if hasattr(self, 'correlation_id'):
+        if hasattr(self, 'correlation_id') and self.correlation_id:
             request_headers.setdefault('Correlation-Id', self.correlation_id)
         elif hasattr(self, 'request') and \
                 self.request.headers.get('Correlation-Id'):

tests.py

@@ -248,6 +248,16 @@ def test_without_correlation_id_behavior(self):
         self.assertEqual(response.code, 502)
         self.assertEqual(response.attempts, 3)
 
+    @testing.gen_test
+    def test_correlation_id_is_none(self):
+        mixin = self.create_mixin()
+        mixin.correlation_id = None
+        response = yield mixin.http_fetch(
+            self.get_url('/error?status_code=502'))
+        self.assertFalse(response.ok)
+        self.assertEqual(response.code, 502)
+        self.assertEqual(response.attempts, 3)
+
     @testing.gen_test
     def test_get(self):
         response = yield self.mixin.http_fetch(