Validator transfer p3

tests/agent_features/test_asgi_browser.py

@@ -111,7 +111,7 @@ def test_footer_attributes():
 
     obfuscation_key = settings.license_key[:13]
 
-    type_transaction_data = unicode if six.PY2 else str  # noqa: F821
+    type_transaction_data = unicode if six.PY2 else str  # noqa: F821, pylint: disable=E0602
     assert isinstance(data["transactionName"], type_transaction_data)
 
     txn_name = deobfuscate(data["transactionName"], obfuscation_key)

tests/agent_features/test_attributes_in_action.py

@@ -20,14 +20,22 @@
     override_application_settings,
     reset_core_stats_engine,
     validate_attributes,
+)
+from testing_support.validators.validate_browser_attributes import (
     validate_browser_attributes,
+)
+from testing_support.validators.validate_error_event_attributes import (
     validate_error_event_attributes,
+)
+from testing_support.validators.validate_error_event_attributes_outside_transaction import (
     validate_error_event_attributes_outside_transaction,
-    validate_error_trace_attributes_outside_transaction,
 )
 from testing_support.validators.validate_error_trace_attributes import (
     validate_error_trace_attributes,
 )
+from testing_support.validators.validate_error_trace_attributes_outside_transaction import (
+    validate_error_trace_attributes_outside_transaction,
+)
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_error_trace_attributes import (
     validate_transaction_error_trace_attributes,
@@ -43,7 +51,7 @@
 from newrelic.api.background_task import background_task
 from newrelic.api.message_transaction import message_transaction
 from newrelic.api.time_trace import notice_error
-from newrelic.api.transaction import add_custom_attribute, current_transaction, set_user_id
+from newrelic.api.transaction import add_custom_attribute, set_user_id
 from newrelic.api.wsgi_application import wsgi_application
 from newrelic.common.object_names import callable_name
 
@@ -930,16 +938,21 @@ def test_none_type_routing_key_agent_attribute():
 _forgone_agent_attributes = []
 
 
-@pytest.mark.parametrize('input_user_id, reported_user_id, high_security',(
+@pytest.mark.parametrize(
+    "input_user_id, reported_user_id, high_security",
+    (
         ("1234", "1234", True),
-        ("a" * 260,  "a" * 255, False),
-))
+        ("a" * 260, "a" * 255, False),
+    ),
+)
 def test_enduser_id_attribute_api_valid_types(input_user_id, reported_user_id, high_security):
     @reset_core_stats_engine()
     @validate_error_trace_attributes(
         callable_name(ValueError), exact_attrs={"user": {}, "intrinsic": {}, "agent": {"enduser.id": reported_user_id}}
     )
-    @validate_error_event_attributes(exact_attrs={"user": {}, "intrinsic": {}, "agent": {"enduser.id": reported_user_id}})
+    @validate_error_event_attributes(
+        exact_attrs={"user": {}, "intrinsic": {}, "agent": {"enduser.id": reported_user_id}}
+    )
     @validate_attributes("agent", _required_agent_attributes, _forgone_agent_attributes)
     @background_task()
     @override_application_settings({"high_security": high_security})
@@ -950,10 +963,11 @@ def _test():
             raise ValueError()
         except Exception:
             notice_error()
+
     _test()
 
 
-@pytest.mark.parametrize('input_user_id',(None, '', 123))
+@pytest.mark.parametrize("input_user_id", (None, "", 123))
 def test_enduser_id_attribute_api_invalid_types(input_user_id):
     @reset_core_stats_engine()
     @validate_attributes("agent", [], ["enduser.id"])
@@ -965,4 +979,5 @@ def _test():
             raise ValueError()
         except Exception:
             notice_error()
+
     _test()

tests/agent_features/test_collector_payloads.py

@@ -14,15 +14,15 @@
 
 import pytest
 import webtest
-from testing_support.fixtures import (
-    override_application_settings,
-    validate_custom_event_collector_json,
-)
+from testing_support.fixtures import override_application_settings
 from testing_support.sample_applications import (
     simple_app,
     simple_custom_event_app,
     simple_exceptional_app,
 )
+from testing_support.validators.validate_custom_event_collector_json import (
+    validate_custom_event_collector_json,
+)
 from testing_support.validators.validate_error_event_collector_json import (
     validate_error_event_collector_json,
 )