Validator transfer from fixtures.py to validators directory, Part 1

tests/adapter_cheroot/test_wsgi.py

@@ -16,7 +16,7 @@
 
 import cheroot.wsgi
 import newrelic.api.transaction
-from testing_support.fixtures import validate_transaction_metrics
+from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 
 def get_open_port():

tests/adapter_daphne/test_daphne.py

@@ -21,8 +21,6 @@
 from testing_support.fixtures import (
     override_application_settings,
     raise_background_exceptions,
-    validate_transaction_errors,
-    validate_transaction_metrics,
     wait_for_background_threads,
 )
 from testing_support.sample_asgi_applications import (
@@ -32,6 +30,12 @@
     simple_app_v3,
 )
 from testing_support.util import get_open_port
+from testing_support.validators.validate_transaction_errors import (
+    validate_transaction_errors,
+)
+from testing_support.validators.validate_transaction_metrics import (
+    validate_transaction_metrics,
+)
 
 from newrelic.common.object_names import callable_name
 
@@ -126,7 +130,7 @@ def test_daphne_200(port, app):
     @raise_background_exceptions()
     @wait_for_background_threads()
     def response():
-        return urlopen("http://localhost:%d" % port, timeout=10)
+        return urlopen("http://localhost:%d" % port, timeout=10)  # nosec
 
     assert response().status == 200
 
@@ -139,7 +143,7 @@ def test_daphne_500(port, app):
     @wait_for_background_threads()
     def _test():
         try:
-            urlopen("http://localhost:%d/exc" % port)
+            urlopen("http://localhost:%d/exc" % port)  # nosec
         except HTTPError:
             pass
 

tests/adapter_hypercorn/test_hypercorn.py

@@ -22,8 +22,6 @@
 from testing_support.fixtures import (
     override_application_settings,
     raise_background_exceptions,
-    validate_transaction_errors,
-    validate_transaction_metrics,
     wait_for_background_threads,
 )
 from testing_support.sample_asgi_applications import (
@@ -32,6 +30,12 @@
     simple_app_v2_raw,
 )
 from testing_support.util import get_open_port
+from testing_support.validators.validate_transaction_errors import (
+    validate_transaction_errors,
+)
+from testing_support.validators.validate_transaction_metrics import (
+    validate_transaction_metrics,
+)
 
 from newrelic.api.transaction import ignore_transaction
 from newrelic.common.object_names import callable_name
@@ -115,7 +119,7 @@ def wait_for_port(port, retries=10):
     status = None
     for _ in range(retries):
         try:
-            status = urlopen("http://localhost:%d/ignored" % port, timeout=1).status
+            status = urlopen("http://localhost:%d/ignored" % port, timeout=1).status  # nosec
             assert status == 200
             return
         except Exception as e:
@@ -139,7 +143,7 @@ def test_hypercorn_200(port, app):
     @raise_background_exceptions()
     @wait_for_background_threads()
     def response():
-        return urlopen("http://localhost:%d" % port, timeout=10)
+        return urlopen("http://localhost:%d" % port, timeout=10)  # nosec
 
     assert response().status == 200
 
@@ -152,6 +156,6 @@ def test_hypercorn_500(port, app):
     @wait_for_background_threads()
     def _test():
         with pytest.raises(HTTPError):
-            urlopen("http://localhost:%d/exc" % port)
+            urlopen("http://localhost:%d/exc" % port)  # nosec
 
     _test()

tests/adapter_uvicorn/test_uvicorn.py

@@ -23,10 +23,10 @@
 from testing_support.fixtures import (
     override_application_settings,
     raise_background_exceptions,
-    validate_transaction_errors,
-    validate_transaction_metrics,
     wait_for_background_threads,
 )
+from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
+from testing_support.validators.validate_transaction_errors import validate_transaction_errors
 from testing_support.sample_asgi_applications import (
     AppWithCall,
     AppWithCallRaw,

tests/agent_features/_test_async_coroutine_trace.py

@@ -18,8 +18,8 @@
 import time
 
 import pytest
-from testing_support.fixtures import (
-    capture_transaction_metrics,
+from testing_support.fixtures import capture_transaction_metrics
+from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 

tests/agent_features/test_asgi_browser.py

@@ -18,9 +18,11 @@
 import six
 from bs4 import BeautifulSoup
 from testing_support.asgi_testing import AsgiTest
-from testing_support.fixtures import (
-    override_application_settings,
+from testing_support.fixtures import override_application_settings
+from testing_support.validators.validate_custom_parameters import (
     validate_custom_parameters,
+)
+from testing_support.validators.validate_transaction_errors import (
     validate_transaction_errors,
 )
 

tests/agent_features/test_asgi_distributed_tracing.py

@@ -22,8 +22,8 @@
 from newrelic.api.asgi_application import asgi_application, ASGIWebTransaction
 
 from testing_support.asgi_testing import AsgiTest
-from testing_support.fixtures import (override_application_settings,
-        validate_transaction_metrics)
+from testing_support.fixtures import override_application_settings
+from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 
 distributed_trace_intrinsics = ['guid', 'traceId', 'priority', 'sampled']

tests/agent_features/test_asgi_transaction.py

@@ -16,11 +16,7 @@
 
 import pytest
 from testing_support.asgi_testing import AsgiTest
-from testing_support.fixtures import (
-    override_application_settings,
-    validate_transaction_errors,
-    validate_transaction_metrics,
-)
+from testing_support.fixtures import override_application_settings
 from testing_support.sample_asgi_applications import (
     AppWithDescriptor,
     simple_app_v2,
@@ -29,6 +25,12 @@
     simple_app_v3,
     simple_app_v3_raw,
 )
+from testing_support.validators.validate_transaction_errors import (
+    validate_transaction_errors,
+)
+from testing_support.validators.validate_transaction_metrics import (
+    validate_transaction_metrics,
+)
 
 from newrelic.api.asgi_application import ASGIApplicationWrapper, asgi_application
 

tests/agent_features/test_asgi_w3c_trace_context.py

@@ -19,11 +19,11 @@
 from newrelic.api.asgi_application import asgi_application
 
 from testing_support.asgi_testing import AsgiTest
-from testing_support.fixtures import (override_application_settings,
-        validate_transaction_event_attributes, validate_transaction_metrics)
+from testing_support.fixtures import override_application_settings
+from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 from testing_support.validators.validate_span_events import (
     validate_span_events)
-
+from testing_support.validators.validate_transaction_event_attributes import validate_transaction_event_attributes
 
 @asgi_application()
 async def target_asgi_application(scope, receive, send):

tests/agent_features/test_async_context_propagation.py

@@ -16,9 +16,8 @@
 from testing_support.fixtures import (
     function_not_called,
     override_generic_settings,
-    validate_transaction_metrics,
 )
-
+from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 from newrelic.api.application import application_instance as application
 from newrelic.api.background_task import BackgroundTask, background_task
 from newrelic.api.database_trace import database_trace

tests/agent_features/test_attribute.py

@@ -21,9 +21,11 @@
     validate_agent_attribute_types,
     validate_attributes,
     validate_attributes_complete,
-    validate_custom_parameters,
 )
 from testing_support.sample_applications import fully_featured_app
+from testing_support.validators.validate_custom_parameters import (
+    validate_custom_parameters,
+)
 
 from newrelic.api.background_task import background_task
 from newrelic.api.transaction import add_custom_attribute, add_custom_attributes

tests/agent_features/test_attributes_in_action.py

@@ -25,10 +25,12 @@
     validate_error_event_attributes_outside_transaction,
     validate_error_trace_attributes_outside_transaction,
     validate_transaction_error_trace_attributes,
-    validate_transaction_event_attributes,
     validate_transaction_trace_attributes,
 )
 from testing_support.validators.validate_span_events import validate_span_events
+from testing_support.validators.validate_transaction_event_attributes import (
+    validate_transaction_event_attributes,
+)
 
 from newrelic.api.application import application_instance as application
 from newrelic.api.message_transaction import message_transaction

tests/agent_features/test_browser.py

@@ -17,9 +17,11 @@
 
 import six
 import webtest
-from testing_support.fixtures import (
-    override_application_settings,
+from testing_support.fixtures import override_application_settings
+from testing_support.validators.validate_custom_parameters import (
     validate_custom_parameters,
+)
+from testing_support.validators.validate_transaction_errors import (
     validate_transaction_errors,
 )
 

tests/agent_features/test_coroutine_trace.py

@@ -18,11 +18,12 @@
 import time
 
 import pytest
-from testing_support.fixtures import (
-    capture_transaction_metrics,
+from testing_support.fixtures import capture_transaction_metrics, validate_tt_parenting
+from testing_support.validators.validate_transaction_errors import (
     validate_transaction_errors,
+)
+from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
-    validate_tt_parenting,
 )
 
 from newrelic.api.background_task import background_task

tests/agent_features/test_coroutine_transaction.py

@@ -19,6 +19,8 @@
 from testing_support.fixtures import (
     capture_transaction_metrics,
     override_generic_settings,
+)
+from testing_support.validators.validate_transaction_errors import (
     validate_transaction_errors,
 )
 

tests/agent_features/test_distributed_tracing.py

@@ -26,8 +26,10 @@
 from newrelic.api.wsgi_application import wsgi_application
 
 from testing_support.fixtures import (override_application_settings,
-        validate_attributes, validate_transaction_event_attributes,
-        validate_error_event_attributes, validate_transaction_metrics)
+        validate_attributes, 
+        validate_error_event_attributes)
+from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
+from testing_support.validators.validate_transaction_event_attributes import validate_transaction_event_attributes
 
 distributed_trace_intrinsics = ['guid', 'traceId', 'priority', 'sampled']
 inbound_payload_intrinsics = ['parent.type', 'parent.app', 'parent.account',

tests/agent_features/test_error_events.py

@@ -23,10 +23,12 @@
     override_application_settings,
     reset_core_stats_engine,
     validate_error_event_sample_data,
-    validate_non_transaction_error_event,
     validate_transaction_error_event_count,
 )
 from testing_support.sample_applications import fully_featured_app
+from testing_support.validators.validate_non_transaction_error_event import (
+    validate_non_transaction_error_event,
+)
 
 from newrelic.api.application import application_instance as application
 from newrelic.api.application import application_settings

tests/agent_features/test_event_loop_wait_time.py

@@ -18,9 +18,13 @@
 import pytest
 from testing_support.fixtures import (
     override_application_settings,
+    validate_transaction_trace_attributes,
+)
+from testing_support.validators.validate_transaction_event_attributes import (
     validate_transaction_event_attributes,
+)
+from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
-    validate_transaction_trace_attributes,
 )
 
 from newrelic.api.background_task import background_task

tests/agent_features/test_function_trace.py

@@ -17,9 +17,8 @@
 from newrelic.api.background_task import background_task
 from newrelic.api.function_trace import FunctionTrace
 
-from testing_support.fixtures import (validate_transaction_metrics,
-        validate_tt_parenting)
-
+from testing_support.fixtures import validate_tt_parenting
+from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 _test_function_trace_default_group_scoped_metrics = [
         ('Function/FunctionTrace', 1)]

tests/agent_features/test_high_security_mode.py

@@ -24,11 +24,17 @@
     validate_attributes_complete,
     validate_custom_event_count,
     validate_custom_event_in_application_stats_engine,
+    validate_request_params_omitted,
+    validate_tt_segment_params,
+)
+from testing_support.validators.validate_custom_parameters import (
     validate_custom_parameters,
+)
+from testing_support.validators.validate_non_transaction_error_event import (
     validate_non_transaction_error_event,
-    validate_request_params_omitted,
+)
+from testing_support.validators.validate_transaction_errors import (
     validate_transaction_errors,
-    validate_tt_segment_params,
 )
 
 from newrelic.api.application import application_instance as application

tests/agent_features/test_ignore_expected_errors.py

@@ -19,9 +19,15 @@
     validate_error_event_attributes_outside_transaction,
     validate_error_event_sample_data,
     validate_error_trace_attributes_outside_transaction,
-    validate_time_metrics_outside_transaction,
     validate_transaction_error_trace_attributes,
+)
+from testing_support.validators.validate_time_metrics_outside_transaction import (
+    validate_time_metrics_outside_transaction,
+)
+from testing_support.validators.validate_transaction_errors import (
     validate_transaction_errors,
+)
+from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )