Merge pull request #40 from nvllsvm/cor

Fix exception when correlation_id is None
This commit is contained in:
dave-shawley 2022-03-07 17:14:30 -05:00 committed by GitHub
commit 89b6ebf40d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View file

@ -454,7 +454,7 @@ class HTTPClientMixin:
request_headers.setdefault( request_headers.setdefault(
'Content-Type', 'Content-Type',
str(content_type) or str(CONTENT_TYPE_MSGPACK)) 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) request_headers.setdefault('Correlation-Id', self.correlation_id)
elif hasattr(self, 'request') and \ elif hasattr(self, 'request') and \
self.request.headers.get('Correlation-Id'): self.request.headers.get('Correlation-Id'):

View file

@ -248,6 +248,16 @@ class MixinTestCase(testing.AsyncHTTPTestCase):
self.assertEqual(response.code, 502) self.assertEqual(response.code, 502)
self.assertEqual(response.attempts, 3) 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 @testing.gen_test
def test_get(self): def test_get(self):
response = yield self.mixin.http_fetch( response = yield self.mixin.http_fetch(