Revert Update all scikitlearn tests with enabled settings override.

newrelic · Sep 19, 2023 · 152807e · 152807e
1 parent ca4d532
commit 152807e
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 265 deletions.
diff --git a/tests/agent_features/conftest.py b/tests/agent_features/conftest.py
@@ -30,6 +30,7 @@
     "debug.record_transaction_failure": True,
     "debug.log_autorum_middleware": True,
     "agent_limits.errors_per_harvest": 100,
+    "ml_insights_events.enabled": True
 }
 
 collector_agent_registration = collector_agent_registration_fixture(

diff --git a/tests/agent_features/test_ml_events.py b/tests/agent_features/test_ml_events.py
@@ -57,7 +57,6 @@ def core_app(collector_agent_registration):
     return app._agent.application(app.name)
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @validate_ml_event_payload(
     [{"foo": "bar", "real_agent_id": "1234567", "event.domain": "newrelic.ml_events", "event.name": "InferenceEvent"}]
 )
@@ -71,7 +70,6 @@ def _test():
     core_app.harvest()
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @validate_ml_event_payload(
     [{"foo": "bar", "real_agent_id": "1234567", "event.domain": "newrelic.ml_events", "event.name": "InferenceEvent"}]
 )
@@ -85,7 +83,6 @@ def _test():
     core_app.harvest()
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @pytest.mark.parametrize(
     "params,expected",
     [
@@ -105,7 +102,6 @@ def _test():
     _test()
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @pytest.mark.parametrize(
     "params,expected",
     [
@@ -125,31 +121,27 @@ def _test():
     _test()
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @reset_core_stats_engine()
 @validate_ml_event_count(count=0)
 @background_task()
 def test_record_ml_event_inside_transaction_bad_event_type():
     record_ml_event("!@#$%^&*()", {"foo": "bar"})
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @reset_core_stats_engine()
 @validate_ml_event_count(count=0)
 def test_record_ml_event_outside_transaction_bad_event_type():
     app = application()
     record_ml_event("!@#$%^&*()", {"foo": "bar"}, application=app)
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @reset_core_stats_engine()
 @validate_ml_event_count(count=0)
 @background_task()
 def test_record_ml_event_inside_transaction_params_not_a_dict():
     record_ml_event("ParamsListEvent", ["not", "a", "dict"])
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @reset_core_stats_engine()
 @validate_ml_event_count(count=0)
 def test_record_ml_event_outside_transaction_params_not_a_dict():
@@ -159,7 +151,7 @@ def test_record_ml_event_outside_transaction_params_not_a_dict():
 
 # Tests for ML Events configuration settings
 
-
+@override_application_settings({"ml_insights_events.enabled": False})
 @reset_core_stats_engine()
 @validate_ml_event_count(count=0)
 @background_task()
@@ -174,13 +166,15 @@ def test_ml_event_settings_check_ml_insights_disabled():
 # event_type and attribute processing.
 
 
+@override_application_settings({"ml_insights_events.enabled": False})
 @reset_core_stats_engine()
 @function_not_called("newrelic.api.transaction", "create_custom_event")
 @background_task()
 def test_transaction_create_ml_event_not_called():
     record_ml_event("FooEvent", {"foo": "bar"})
 
 
+@override_application_settings({"ml_insights_events.enabled": False})
 @reset_core_stats_engine()
 @function_not_called("newrelic.core.application", "create_custom_event")
 @background_task()
@@ -189,7 +183,6 @@ def test_application_create_ml_event_not_called():
     record_ml_event("FooEvent", {"foo": "bar"}, application=app)
 
 
-@override_application_settings({"ml_insights_events.enabled": True})
 @pytest.fixture(scope="module", autouse=True, params=["protobuf", "json"])
 def otlp_content_encoding(request):
     if six.PY2 and request.param == "protobuf":

diff --git a/tests/mlmodel_sklearn/conftest.py b/tests/mlmodel_sklearn/conftest.py
@@ -23,6 +23,9 @@
     "transaction_tracer.stack_trace_threshold": 0.0,
     "debug.log_data_collector_payloads": True,
     "debug.record_transaction_failure": True,
+    "machine_learning.enabled": True,
+    "machine_learning.inference_events_value.enabled": True,
+    "ml_insights_events.enabled": True
 }
 collector_agent_registration = collector_agent_registration_fixture(
     app_name="Python Agent Test (mlmodel_sklearn)",

diff --git a/tests/mlmodel_sklearn/test_calibration_models.py b/tests/mlmodel_sklearn/test_calibration_models.py
@@ -13,22 +13,14 @@
 # limitations under the License.
 
 import pytest
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
 from newrelic.packages import six
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
 
-
-@override_application_settings(enabled_settings)
 def test_model_methods_wrapped_in_function_trace(calibration_model_name, run_calibration_model):
     expected_scoped_metrics = {
         "CalibratedClassifierCV": [

diff --git a/tests/mlmodel_sklearn/test_cluster_models.py b/tests/mlmodel_sklearn/test_cluster_models.py
@@ -14,7 +14,6 @@
 
 import pytest
 from sklearn import __version__  # noqa: this is needed for get_package_version
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
@@ -25,14 +24,7 @@
 
 SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
 
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "cluster_model_name",
     [
@@ -123,7 +115,6 @@ def _test():
     _test()
 
 
-@override_application_settings(enabled_settings)
 @pytest.mark.skipif(SKLEARN_VERSION < (1, 1, 0), reason="Requires sklearn > 1.1")
 @pytest.mark.parametrize(
     "cluster_model_name",

diff --git a/tests/mlmodel_sklearn/test_compose_models.py b/tests/mlmodel_sklearn/test_compose_models.py
@@ -15,22 +15,14 @@
 import pytest
 from sklearn.linear_model import LinearRegression
 from sklearn.preprocessing import Normalizer
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
 from newrelic.packages import six
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
 
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "compose_model_name",
     [

diff --git a/tests/mlmodel_sklearn/test_covariance_models.py b/tests/mlmodel_sklearn/test_covariance_models.py
@@ -13,22 +13,14 @@
 # limitations under the License.
 
 import pytest
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
 from newrelic.packages import six
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
 
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "covariance_model_name",
     [

diff --git a/tests/mlmodel_sklearn/test_cross_decomposition_models.py b/tests/mlmodel_sklearn/test_cross_decomposition_models.py
@@ -13,22 +13,14 @@
 # limitations under the License.
 
 import pytest
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
 from newrelic.packages import six
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
 
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "cross_decomposition_model_name",
     [

diff --git a/tests/mlmodel_sklearn/test_discriminant_analysis_models.py b/tests/mlmodel_sklearn/test_discriminant_analysis_models.py
@@ -13,22 +13,14 @@
 # limitations under the License.
 
 import pytest
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
 from newrelic.packages import six
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
 
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "discriminant_analysis_model_name",
     [

diff --git a/tests/mlmodel_sklearn/test_dummy_models.py b/tests/mlmodel_sklearn/test_dummy_models.py
@@ -14,7 +14,6 @@
 
 import pytest
 from sklearn import __init__  # noqa: needed for get_package_version
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
@@ -25,14 +24,7 @@
 
 SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
 
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "dummy_model_name",
     [

diff --git a/tests/mlmodel_sklearn/test_ensemble_models.py b/tests/mlmodel_sklearn/test_ensemble_models.py
@@ -14,7 +14,6 @@
 
 import pytest
 from sklearn.ensemble import RandomForestClassifier, RandomForestRegressor
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
@@ -25,14 +24,6 @@
 
 SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
-
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "ensemble_model_name",
     [
@@ -149,7 +140,6 @@ def _test():
     _test()
 
 
-@override_application_settings(enabled_settings)
 @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0) or SKLEARN_VERSION >= (1, 1, 0), reason="Requires 1.0 <= sklearn < 1.1")
 @pytest.mark.parametrize(
     "ensemble_model_name",
@@ -206,7 +196,7 @@ def _test():
     _test()
 
 
-@override_application_settings(enabled_settings)
+
 @pytest.mark.skipif(SKLEARN_VERSION < (1, 1, 0), reason="Requires sklearn >= 1.1")
 @pytest.mark.parametrize(
     "ensemble_model_name",

diff --git a/tests/mlmodel_sklearn/test_feature_selection_models.py b/tests/mlmodel_sklearn/test_feature_selection_models.py
@@ -14,7 +14,6 @@
 
 import pytest
 from sklearn.ensemble import AdaBoostClassifier
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
@@ -25,14 +24,6 @@
 
 SKLEARN_VERSION = tuple(map(int, get_package_version("sklearn").split(".")))
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
-
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "feature_selection_model_name",
     [
@@ -81,7 +72,6 @@ def _test():
     _test()
 
 
-@override_application_settings(enabled_settings)
 @pytest.mark.skipif(SKLEARN_VERSION < (1, 0, 0), reason="Requires sklearn >= 1.0")
 @pytest.mark.parametrize(
     "feature_selection_model_name",

diff --git a/tests/mlmodel_sklearn/test_gaussian_process_models.py b/tests/mlmodel_sklearn/test_gaussian_process_models.py
@@ -13,22 +13,13 @@
 # limitations under the License.
 
 import pytest
-from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
 from newrelic.packages import six
 
-enabled_settings = {
-    "machine_learning.enabled": True,
-    "machine_learning.inference_events_value.enabled": True,
-    "ml_insights_events.enabled": True
-}
-
-
-@override_application_settings(enabled_settings)
 @pytest.mark.parametrize(
     "gaussian_process_model_name",
     [