Skip to content

Commit 25477e7

Browse files
committed
clearer pytest marker name
1 parent 4b7b761 commit 25477e7

7 files changed

Lines changed: 11 additions & 11 deletions

api_tests/institutions/views/test_institution_department_list.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from osf.metrics.utils import YearMonth
1212

1313

14-
@pytest.mark.djelme_elasticsearch_backends
14+
@pytest.mark.osfmetrics_elastic_backends
1515
@pytest.mark.django_db
1616
class TestInstitutionDepartmentList:
1717

api_tests/institutions/views/test_institution_summary_metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from osf.metrics.monthly_reports import MonthlyInstitutionSummaryReport
99

1010

11-
@pytest.mark.djelme_elasticsearch_backends
11+
@pytest.mark.osfmetrics_elastic_backends
1212
@pytest.mark.django_db
1313
class TestInstitutionSummaryMetricsList:
1414

api_tests/institutions/views/test_institution_user_metric_list.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from tests.utils import capture_notifications
1818

1919

20-
@pytest.mark.djelme_elasticsearch_backends
20+
@pytest.mark.osfmetrics_elastic_backends
2121
@pytest.mark.django_db
2222
class TestInstitutionUserMetricList:
2323
@pytest.fixture()

api_tests/metrics/test_raw_metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
pytestmark = pytest.mark.django_db
1313

1414

15-
@pytest.mark.djelme_elasticsearch_backends
15+
@pytest.mark.osfmetrics_elastic_backends
1616
class TestRawMetrics:
1717

1818
@pytest.fixture(autouse=True)

api_tests/metrics/test_registries_moderation_metrics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from tests.utils import capture_notifications
77

88

9-
@pytest.mark.djelme_elasticsearch_backends
9+
@pytest.mark.osfmetrics_elastic_backends
1010
@pytest.mark.django_db
1111
class TestRegistrationModerationMetrics:
1212

@@ -34,7 +34,7 @@ def test_record_transitions(self, registration):
3434
assert data['comment'] == 'Metrics is easy'
3535

3636

37-
@pytest.mark.djelme_elasticsearch_backends
37+
@pytest.mark.osfmetrics_elastic_backends
3838
@pytest.mark.django_db
3939
class TestRegistrationModerationMetricsView:
4040

conftest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ def _test_speedups_disable(request, settings, _test_speedups):
129129

130130

131131
@pytest.fixture(scope='function', autouse=True)
132-
def _djelme_elasticsearch_backends_marker(request):
133-
"""Clear out all indices and index templates before and after
134-
tests marked with `djelme_elasticsearch_backends`.
132+
def _osfmetrics_elastic_backends_marker(request):
133+
"""Enable osfmetrics and set up temporary indexes and index templates for
134+
tests marked with `osfmetrics_elastic_backends`.
135135
"""
136-
marker = request.node.get_closest_marker('djelme_elasticsearch_backends')
136+
marker = request.node.get_closest_marker('osfmetrics_elastic_backends')
137137

138138
if not marker:
139139
yield

pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ markers =
99
enable_bookmark_creation
1010
enable_implicit_clean
1111
enable_account_status_messaging
12-
djelme_elasticsearch_backends
12+
osfmetrics_elastic_backends

0 commit comments

Comments
 (0)