diff --git a/rhodecode/tests/test_validators.py b/rhodecode/tests/test_validators.py --- a/rhodecode/tests/test_validators.py +++ b/rhodecode/tests/test_validators.py @@ -12,6 +12,9 @@ from rhodecode.model.repos_group import from rhodecode.config.routing import ADMIN_PREFIX from rhodecode.model.db import ChangesetStatus, Repository from rhodecode.model.changeset_status import ChangesetStatusModel +from rhodecode.tests.fixture import Fixture + +fixture = Fixture() class TestReposGroups(unittest.TestCase): @@ -55,9 +58,9 @@ class TestReposGroups(unittest.TestCase) self.assertRaises(formencode.Invalid, validator.to_python, 'default') self.assertRaises(formencode.Invalid, validator.to_python, '.,') - gr = UserGroupModel().create('test') - gr2 = UserGroupModel().create('tes2') - Session.commit() + gr = fixture.create_user_group('test') + gr2 = fixture.create_user_group('tes2') + Session().commit() self.assertRaises(formencode.Invalid, validator.to_python, 'test') assert gr.users_group_id != None validator = v.ValidUserGroup(edit=True, @@ -69,7 +72,7 @@ class TestReposGroups(unittest.TestCase) self.assertRaises(formencode.Invalid, validator.to_python, 'TEST') UserGroupModel().delete(gr) UserGroupModel().delete(gr2) - Session.commit() + Session().commit() def test_ValidReposGroup(self): validator = v.ValidReposGroup()