Removes mock package dependency

Author: jairhenrique

tests/cross_agent/test_docker_container_id.py

@@ -15,7 +15,6 @@
 import json
 import os
 
-import mock
 import pytest
 
 import newrelic.common.utilization as u
@@ -29,11 +28,14 @@ def _load_docker_test_attributes():
     [(<filename>, <containerId>), ...]
 
     """
+    docker_test_attributes = []
     test_cases = os.path.join(DOCKER_FIXTURE, "cases.json")
     with open(test_cases, "r") as fh:
         js = fh.read()
     json_list = json.loads(js)
     docker_test_attributes = [(json_record["filename"], json_record["containerId"]) for json_record in json_list]
+    for json_record in json_list:
+        docker_test_attributes.append((json_record["filename"], json_record["containerId"]))
     return docker_test_attributes
 
 
@@ -43,7 +45,7 @@ def _mock_open(filename, mode):
             raise FileNotFoundError
         elif filename == "/proc/self/cgroup":
             return mock_file
-        raise RuntimeError
+        raise RuntimeError()
 
     return _mock_open
 

tests/cross_agent/test_docker_container_id_v2.py

@@ -15,7 +15,6 @@
 import json
 import os
 
-import mock
 import pytest
 
 import newrelic.common.utilization as u
@@ -29,11 +28,13 @@ def _load_docker_test_attributes():
     [(<filename>, <containerId>), ...]
 
     """
+    docker_test_attributes = []
     test_cases = os.path.join(DOCKER_FIXTURE, "cases.json")
     with open(test_cases, "r") as fh:
         js = fh.read()
     json_list = json.loads(js)
-    docker_test_attributes = [(json_record["filename"], json_record["containerId"]) for json_record in json_list]
+    for json_record in json_list:
+        docker_test_attributes.append((json_record["filename"], json_record["containerId"]))
     return docker_test_attributes
 
 
@@ -43,7 +44,7 @@ def _mock_open(filename, mode):
             raise FileNotFoundError
         elif filename == "/proc/self/mountinfo":
             return mock_file
-        raise RuntimeError
+        raise RuntimeError()
 
     return _mock_open
 

tests/mlmodel_langchain/test_chain.py

@@ -22,7 +22,7 @@
 from langchain.chains.combine_documents import create_stuff_documents_chain
 from langchain.chains.openai_functions import create_structured_output_chain, create_structured_output_runnable
 from langchain_community.vectorstores.faiss import FAISS
-from mock import patch
+from unittest.mock import patch
 from testing_support.fixtures import reset_core_stats_engine, validate_attributes
 from testing_support.ml_testing_utils import (
     disabled_ai_monitoring_record_content_settings,

tests/mlmodel_langchain/test_tool.py

@@ -20,7 +20,7 @@
 import pydantic_core
 import pytest
 from langchain.tools import tool
-from mock import patch
+from unittest.mock import patch
 from testing_support.fixtures import reset_core_stats_engine, validate_attributes
 from testing_support.ml_testing_utils import (
     disabled_ai_monitoring_record_content_settings,

tox.ini

@@ -250,7 +250,6 @@ deps =
     component_tastypie-tastypielatest: django<4.1
     component_tastypie-tastypielatest: asgiref<3.7.1  # asgiref==3.7.1 only suppport Python 3.10+
     coroutines_asyncio-{py37,py38,py39,py310,py311,py312,py313}: uvloop
-    cross_agent: mock==1.0.1
     cross_agent: requests
     datastore_asyncpg: asyncpg
     datastore_aiomcache: aiomcache