Skip to content

Commit fbfc18f

Browse files
committed
get rid of sample_movies_helper fixture
1 parent 28f8911 commit fbfc18f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

docker/mongodb-kubernetes-tests/tests/search/search_enterprise_basic.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,27 +155,27 @@ def test_wait_for_database_resource_ready(mdb: MongoDB):
155155
), "mongot parameters not found in mongod config"
156156

157157

158-
@fixture(scope="function")
159-
def sample_movies_helper(request, mdb: MongoDB) -> SampleMoviesSearchHelper:
160-
credentials = (USER_NAME, USER_PASSWORD)
161-
if request.node.get_closest_marker("use_admin_user"):
162-
credentials = (ADMIN_USER_NAME, ADMIN_USER_PASSWORD)
163-
return movies_search_helper.SampleMoviesSearchHelper(SearchTester(get_connection_string(mdb, *credentials)))
164-
165-
166158
@mark.e2e_search_enterprise_basic
167-
@mark.use_admin_user
168-
def test_search_restore_sample_database(sample_movies_helper: SampleMoviesSearchHelper):
159+
def test_search_restore_sample_database(mdb: MongoDB):
160+
sample_movies_helper = movies_search_helper.SampleMoviesSearchHelper(
161+
SearchTester(get_connection_string(mdb, ADMIN_USER_NAME, ADMIN_USER_PASSWORD))
162+
)
169163
sample_movies_helper.restore_sample_database()
170164

171165

172166
@mark.e2e_search_enterprise_basic
173167
def test_search_create_search_index(sample_movies_helper: SampleMoviesSearchHelper):
168+
sample_movies_helper = movies_search_helper.SampleMoviesSearchHelper(
169+
SearchTester(get_connection_string(mdb, USER_NAME, USER_PASSWORD))
170+
)
174171
sample_movies_helper.create_search_index()
175172

176173

177174
@mark.e2e_search_enterprise_basic
178175
def test_search_assert_search_query(sample_movies_helper: SampleMoviesSearchHelper):
176+
sample_movies_helper = movies_search_helper.SampleMoviesSearchHelper(
177+
SearchTester(get_connection_string(mdb, USER_NAME, USER_PASSWORD))
178+
)
179179
sample_movies_helper.assert_search_query(retry_timeout=60)
180180

181181

0 commit comments

Comments
 (0)