better use waffle switch ELASTICSEARCH_METRICS

Author: aaxelb

api_tests/metrics/test_registries_moderation_metrics.py

@@ -1,7 +1,5 @@
 import pytest
-from waffle.testutils import override_switch
 
-from osf import features
 from osf_tests.factories import RegistrationFactory, AuthUserFactory
 from osf.utils.workflows import RegistrationModerationStates, RegistrationModerationTriggers
 from osf.metrics import RegistriesModerationMetrics
@@ -17,11 +15,6 @@ class TestRegistrationModerationMetrics:
     def registration(self):
         return RegistrationFactory()
 
-    @pytest.fixture(autouse=True)
-    def enable_elasticsearch_metrics(self):
-        with override_switch(features.ELASTICSEARCH_METRICS, active=True):
-            yield
-
     @pytest.mark.es_metrics
     def test_record_transitions(self, registration):
         with capture_notifications():
@@ -50,11 +43,6 @@ class TestRegistrationModerationMetricsView:
     def registration(self):
         return RegistrationFactory()
 
-    @pytest.fixture(autouse=True)
-    def enable_elasticsearch_metrics(self):
-        with override_switch(features.ELASTICSEARCH_METRICS, active=True):
-            yield
-
     @pytest.fixture
     def user(self):
         user = AuthUserFactory()

conftest.py

@@ -10,12 +10,15 @@
 import pytest
 import responses
 import xml.etree.ElementTree as ET
+from waffle.testutils import override_switch
 
 from api_tests.share import _utils as shtrove_test_utils
 from framework.celery_tasks import app as celery_app
 from osf.external.spam import tasks as spam_tasks
 from website import settings as website_settings
 from osf.management.commands.populate_notification_types import populate_notification_types
+from osf import features
+
 
 def pytest_configure(config):
     if not os.getenv('GITHUB_ACTIONS') == 'true':
@@ -141,12 +144,15 @@ def _es_metrics_marker(request):
     """
     marker = request.node.get_closest_marker('es_metrics')
 
-    if not marker:
-        yield
-        return
-
-    with djelme_test_backends():
-        yield
+    if marker:
+        with (
+            override_switch(features.ELASTICSEARCH_METRICS, active=True),
+            djelme_test_backends(),
+        ):
+            yield
+    else:
+        with override_switch(features.ELASTICSEARCH_METRICS, active=False):
+            yield
 
 
 @pytest.fixture

osf/models/registrations.py

@@ -14,9 +14,11 @@
     UserObjectPermissionBase,
 )
 from dirtyfields import DirtyFieldsMixin
+import waffle
 
 from framework.auth import Auth
 from framework.exceptions import PermissionsError
+from osf import features
 from osf.models import Identifier
 from osf.utils.fields import NonNaiveDateTimeField, LowercaseCharField
 from osf.utils.permissions import ADMIN, READ, WRITE
@@ -782,7 +784,8 @@ def _write_registration_action(self, from_state, to_state, initiated_by, comment
             comment=comment
         )
         action.save()
-        RegistriesModerationMetrics.record_transitions(action)
+        if waffle.switch_is_active(features.ELASTICSEARCH_METRICS):
+            RegistriesModerationMetrics.record_transitions(action)
 
         moderation_notifications = {
             RegistrationModerationTriggers.SUBMIT: notify.notify_submit,

osf_tests/metrics/test_monthly_report.py

@@ -11,8 +11,9 @@
 class TestMonthlyReportKey:
     @pytest.fixture
     def mock_save(self):
-        with mock.patch('elasticsearch6_dsl.Document.save', autospec=True) as mock_save:
-            yield mock_save
+        with mock.patch('elasticsearch_metrics.imps.elastic6.BaseMetric.check_index_template'):
+            with mock.patch('elasticsearch6_dsl.Document.save', autospec=True) as mock_save:
+                yield mock_save
 
     def test_default(self, mock_save):
         # only one of this type of report per month