This is an automated email from the ASF dual-hosted git repository. dill0wn pushed a commit to branch dw/8455-part2 in repository https://gitbox.apache.org/repos/asf/allura.git
commit 4c000b4aaa04cae833c513f037511a99be9d9e0d Author: Dillon Walls <[email protected]> AuthorDate: Fri Sep 30 00:47:39 2022 +0000 fixup! fixup! fixup! fixup! fixup! [#8455] remove @with_setup --- Allura/allura/tests/model/test_oauth.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/Allura/allura/tests/model/test_oauth.py b/Allura/allura/tests/model/test_oauth.py index 67d12b094..edb396abc 100644 --- a/Allura/allura/tests/model/test_oauth.py +++ b/Allura/allura/tests/model/test_oauth.py @@ -16,28 +16,26 @@ # under the License. -from alluratest.tools import with_setup, assert_equal, assert_not_equal - from ming.odm import ThreadLocalORMSession from allura import model as M from alluratest.controller import setup_basic_test, setup_global_objects -def setup_method(): - setup_basic_test() - ThreadLocalORMSession.close_all() - setup_global_objects() +class TestOAuthModel: + def setup_method(self): + setup_basic_test() + ThreadLocalORMSession.close_all() + setup_global_objects() -@with_setup(setup_method) -def test_upsert(): - admin = M.User.by_username('test-admin') - user = M.User.by_username('test-user') - name = 'test-token' - token1 = M.OAuthConsumerToken.upsert(name, admin) - token2 = M.OAuthConsumerToken.upsert(name, admin) - token3 = M.OAuthConsumerToken.upsert(name, user) - assert M.OAuthConsumerToken.query.find().count() == 2 - assert token1._id == token2._id - assert token1._id != token3._id + def test_upsert(self): + admin = M.User.by_username('test-admin') + user = M.User.by_username('test-user') + name = 'test-token' + token1 = M.OAuthConsumerToken.upsert(name, admin) + token2 = M.OAuthConsumerToken.upsert(name, admin) + token3 = M.OAuthConsumerToken.upsert(name, user) + assert M.OAuthConsumerToken.query.find().count() == 2 + assert token1._id == token2._id + assert token1._id != token3._id
