Add unit test for django

logging/tests/unit/handlers/middleware/test_request.py

@@ -25,15 +25,24 @@ def _get_target_class(self):
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
-    def test_get_request(self):
+    def setUp(self):
         from django.conf import settings
         from django.test.utils import setup_test_environment
-        from django.test import RequestFactory
 
-        settings.configure()
+        if not settings.configured:
+            settings.configure()
         setup_test_environment()
 
+    def test_get_request(self):
+        from django.test import RequestFactory
+
         self.middleware = self._make_one()
         self.request = RequestFactory().get('/')
         self.middleware.process_request(self.request)
         self.assertEqual(self.middleware.get_request(), self.request)
+
+
+    def tearDown(self):
+        from django.test.utils import teardown_test_environment
+
+        teardown_test_environment()

logging/tests/unit/handlers/test__helpers.py

@@ -33,25 +33,88 @@ def setUp(self):
 
     def test_trace_id_no_context_header(self):
         from google.cloud.logging.handlers._helpers import get_trace_id_from_flask
+        from google.cloud.logging.handlers._helpers import get_trace_id
         from google.cloud.logging.handlers._helpers import _EMPTY_TRACE_ID
 
         with self.app.test_request_context(
                 path='/',
                 headers={}):
             trace_id = get_trace_id_from_flask()
+            trace_id_returned = get_trace_id()
 
         self.assertEqual(trace_id, _EMPTY_TRACE_ID)
+        self.assertEqual(trace_id_returned, _EMPTY_TRACE_ID)
 
     def test_trace_id_valid_context_header(self):
         from google.cloud.logging.handlers._helpers import get_trace_id_from_flask
+        from google.cloud.logging.handlers._helpers import get_trace_id
 
         FLASK_TRACE_HEADER = 'X_CLOUD_TRACE_CONTEXT'
-        FLASK_TRACE_ID = 'testtraceid/testspanid'
+        FLASK_TRACE_ID = 'testtraceidflask/testspanid'
 
         with self.app.test_request_context(
                 path='/',
                 headers={FLASK_TRACE_HEADER:FLASK_TRACE_ID}):
             trace_id = get_trace_id_from_flask()
+            trace_id_returned = get_trace_id()
 
-        EXPECTED_TRACE_ID = 'testtraceid'
+        EXPECTED_TRACE_ID = 'testtraceidflask'
         self.assertEqual(trace_id, EXPECTED_TRACE_ID)
+        self.assertEqual(trace_id, trace_id_returned)
+
+
+class TestDjangoTrace(unittest.TestCase):
+
+    def setUp(self):
+        from django.conf import settings
+        from django.test.utils import setup_test_environment
+
+        if not settings.configured:
+            settings.configure()
+        setup_test_environment()
+
+    def test_trace_id_no_context_header(self):
+        import mock
+        from django.test import RequestFactory
+        from google.cloud.logging.handlers._helpers import get_trace_id_from_django
+        from google.cloud.logging.handlers._helpers import get_trace_id
+        from google.cloud.logging.handlers._helpers import _EMPTY_TRACE_ID
+
+        request = RequestFactory().get('/')
+
+        with mock.patch(
+                'google.cloud.logging.handlers.middleware.RequestMiddleware.get_request',
+                return_value=request):
+            trace_id = get_trace_id_from_django()
+            trace_id_returned = get_trace_id()
+
+        self.assertEqual(trace_id, _EMPTY_TRACE_ID)
+        self.assertEqual(trace_id_returned, _EMPTY_TRACE_ID)
+
+    def test_trace_id_valid_context_header(self):
+        import mock
+        from django.test import RequestFactory
+        from google.cloud.logging.handlers._helpers import get_trace_id_from_django
+        from google.cloud.logging.handlers._helpers import get_trace_id
+
+        DJANGO_TRACE_HEADER = 'HTTP_X_CLOUD_TRACE_CONTEXT'
+        DJANGO_TRACE_ID = 'testtraceiddjango/testspanid'
+
+        request = RequestFactory().get(
+            '/',
+            **{DJANGO_TRACE_HEADER:DJANGO_TRACE_ID})
+
+        with mock.patch(
+                'google.cloud.logging.handlers.middleware.RequestMiddleware.get_request',
+                return_value=request):
+            trace_id = get_trace_id_from_django()
+            trace_id_returned = get_trace_id()
+
+        EXPECTED_TRACE_ID = 'testtraceiddjango'
+        self.assertEqual(trace_id, EXPECTED_TRACE_ID)
+        self.assertEqual(trace_id, trace_id_returned)
+
+    def tearDown(self):
+        from django.test.utils import teardown_test_environment
+
+        teardown_test_environment()