From 2d8991f83316c58cfc0c5014baf65d75aa17fbcc Mon Sep 17 00:00:00 2001 From: RhodeCode Admin Date: Tue, 29 Aug 2023 16:36:23 +0200 Subject: [PATCH] tests: fixed simplevcs tests --- rhodecode/tests/conftest.py | 8 +++++--- rhodecode/tests/lib/middleware/test_simplevcs.py | 5 ----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/rhodecode/tests/conftest.py b/rhodecode/tests/conftest.py index 3e4aed3a..e6cdc829 100644 --- a/rhodecode/tests/conftest.py +++ b/rhodecode/tests/conftest.py @@ -118,18 +118,20 @@ def test_user_factory(request, baseapp): setattr(usr, k, v) Session().add(usr) - assert User.get_by_username(username) == usr + new_usr = User.get_by_username(username) + new_usr_id = new_usr.user_id + assert new_usr == usr @request.addfinalizer def cleanup(): - if UserModel().get_user(usr.user_id) is None: + if User.get(new_usr_id) is None: return perm = Permission.query().all() for p in perm: UserModel().revoke_perm(usr, p) - UserModel().delete(usr.user_id) + UserModel().delete(new_usr_id) Session().commit() return usr diff --git a/rhodecode/tests/lib/middleware/test_simplevcs.py b/rhodecode/tests/lib/middleware/test_simplevcs.py index 6cb4101e..7613ab0f 100644 --- a/rhodecode/tests/lib/middleware/test_simplevcs.py +++ b/rhodecode/tests/lib/middleware/test_simplevcs.py @@ -144,11 +144,6 @@ def test_handles_exceptions_during_permissions_checks( assert get_user.called -def test_returns_forbidden_if_no_anonymous_access( - vcscontroller, disable_anonymous_user): - vcscontroller.get('/', status=401) - - class StubFailVCSController(simplevcs.SimpleVCS): def _handle_request(self, environ, start_response): raise Exception("BOOM")