Skip to content

Commit d6daabb

Browse files
committed
Simplify clean up call
1 parent 80a4387 commit d6daabb

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

tests/queries_/test_search.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,13 @@ def wrapper(self, fetch, *args, **kwargs):
6060
@skipUnlessDBFeature("supports_atlas_search")
6161
class SearchUtilsMixin(TransactionTestCase):
6262
available_apps = ["queries_"]
63-
models_to_clean = [Article]
6463

6564
delayedAssertCountEqual = _delayed_assertion(timeout=2)(TransactionTestCase.assertCountEqual)
6665
delayedAssertListEqual = _delayed_assertion(timeout=2)(TransactionTestCase.assertListEqual)
6766
delayedAssertQuerySetEqual = _delayed_assertion(timeout=2)(
6867
TransactionTestCase.assertQuerySetEqual
6968
)
7069

71-
@classmethod
72-
def setUpClass(cls):
73-
super().setUpClass()
74-
# Register the cleanup to run after all tests in this class
75-
cls.addClassCleanup(cls.drop_search_indexes)
76-
7770
@staticmethod
7871
def _get_collection(model):
7972
return connection.database.get_collection(model._meta.db_table)
@@ -84,12 +77,10 @@ def create_search_index(cls, model, index_name, definition, type="search"):
8477
idx = SearchIndexModel(definition=definition, name=index_name, type=type)
8578
collection.create_search_index(idx)
8679

87-
@classmethod
88-
def drop_search_indexes(cls):
89-
for model in cls.models_to_clean:
90-
collection = cls._get_collection(model)
91-
for search_indexes in collection.list_search_indexes():
92-
collection.drop_search_index(search_indexes["name"])
80+
def drop_index():
81+
collection.drop_search_index(index_name)
82+
83+
cls.addClassCleanup(drop_index)
9384

9485

9586
@skipUnlessDBFeature("supports_atlas_search")

0 commit comments

Comments
 (0)