# HG changeset patch # User Konstantin Veretennicov # Date 2016-06-15 23:36:29 # Node ID 769e86868c6cfbef2f9c3cdc7c7d2e3a6dc0733b # Parent d9e6e489f171aa0b3037cc38ecde233cabd6c214 tests: wrestle DetachedInstanceError out of create_test_user fixture diff --git a/kallithea/tests/conftest.py b/kallithea/tests/conftest.py --- a/kallithea/tests/conftest.py +++ b/kallithea/tests/conftest.py @@ -9,7 +9,7 @@ from pylons.i18n.translation import _get import pytest from kallithea.model.user import UserModel from kallithea.model.meta import Session -from kallithea.model.db import Setting +from kallithea.model.db import Setting, User def pytest_configure(): @@ -41,14 +41,14 @@ def pytest_configure(): @pytest.yield_fixture def create_test_user(): """Provide users that automatically disappear after test is over.""" - test_users = [] + test_user_ids = [] def _create_test_user(user_form): user = UserModel().create(user_form) - test_users.append(user) + test_user_ids.append(user.user_id) return user yield _create_test_user - for user in test_users: - UserModel().delete(user) + for user_id in test_user_ids: + UserModel().delete(user_id) Session().commit()