Fix SA20 syntax in test_vault_extra_prefs, refactor

jdavcs · Jul 21, 2023 · c7f4194 · c7f4194
1 parent 366fb78
commit c7f4194
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/test/integration/test_vault_extra_prefs.py b/test/integration/test_vault_extra_prefs.py
@@ -9,6 +9,7 @@
     get,
     put,
 )
+from sqlalchemy import select
 
 from galaxy_test.driver import integration_util
 
@@ -28,7 +29,7 @@ def test_extra_prefs_vault_storage(self):
         user = self._setup_user(TEST_USER_EMAIL)
         url = self.__url("information/inputs", user)
         app = cast(Any, self._test_driver.app if self._test_driver else None)
-        db_user = app.model.context.query(app.model.User).filter(app.model.User.email == user["email"]).first()
+        db_user = self._get_dbuser(app, user)
 
         # create some initial data
         put(
@@ -84,7 +85,7 @@ def test_extra_prefs_vault_storage_update_secret(self):
         user = self._setup_user(TEST_USER_EMAIL)
         url = self.__url("information/inputs", user)
         app = cast(Any, self._test_driver.app if self._test_driver else None)
-        db_user = app.model.context.query(app.model.User).filter(app.model.User.email == user["email"]).first()
+        db_user = self._get_dbuser(app, user)
 
         # write the initial secret value
         put(
@@ -130,3 +131,7 @@ def test_extra_prefs_vault_storage_update_secret(self):
 
     def __url(self, action, user):
         return self._api_url(f"users/{user['id']}/{action}", params=dict(key=self.master_api_key))
+
+    def _get_dbuser(self, app, user):
+        stmt = select(app.model.User).filter(app.model.User.email == user["email"]).limit(1)
+        return app.model.session.scalars(stmt).first()