Fix unittests.

Author: purple4reina

datadog_lambda/patch.py

@@ -30,7 +30,6 @@ def patch_all():
     _patch_for_integration_tests()
 
     if config.trace_enabled:
-        # XXX this call is making the tests fail
         patch_all_dd()
     else:
         _patch_http()

tests/test_cold_start.py

@@ -8,6 +8,8 @@
 import datadog_lambda.cold_start as cold_start
 import datadog_lambda.wrapper as wrapper
 
+from tests.utils import get_mock_context
+
 
 class TestColdStartTracingSetup(unittest.TestCase):
     def test_proactive_init(self):
@@ -257,11 +259,7 @@ def finish(span):
     def handler(event, context):
         import tabnanny
 
-    lambda_context = MagicMock()
-    lambda_context.invoked_function_arn = (
-        "arn:aws:lambda:us-west-1:123457598159:function:python-layer-test:1"
-    )
-    lambda_context.get_remaining_time_in_millis = lambda: 100
+    lambda_context = get_mock_context()
 
     handler.cold_start_tracing = True
     handler({}, lambda_context)

tests/test_patch.py

@@ -1,10 +1,18 @@
+import pytest
 import unittest
 
 from unittest.mock import patch, MagicMock
 
 from datadog_lambda.patch import _patch_http, _ensure_patch_requests
 from datadog_lambda.constants import TraceHeader
 
+from ddtrace.contrib.internal.requests.patch import unpatch as unpatch_requests
+
+
+@pytest.fixture(scope="module", autouse=True)
+def reset_patches():
+    unpatch_requests()
+
 
 class TestPatchHTTPClients(unittest.TestCase):
     def setUp(self):

tests/utils.py

@@ -22,6 +22,7 @@ def get_mock_context(
     lambda_context.invoked_function_arn = invoked_function_arn
     lambda_context.function_version = function_version
     lambda_context.function_name = function_name
+    lambda_context.get_remaining_time_in_millis = lambda: 100
     lambda_context.client_context = ClientContext(custom)
     return lambda_context