From 3a64e09b7b42b2647ed2df28ba1064a054117a01 Mon Sep 17 00:00:00 2001 From: RhodeCode Admin Date: Fri, 16 Jul 2021 16:23:02 +0200 Subject: [PATCH] tests: fixed some tests --- rhodecode/tests/events/test_repo.py | 3 ++- rhodecode/tests/models/test_pullrequest.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rhodecode/tests/events/test_repo.py b/rhodecode/tests/events/test_repo.py index 9045624b..48b1bcdc 100644 --- a/rhodecode/tests/events/test_repo.py +++ b/rhodecode/tests/events/test_repo.py @@ -20,6 +20,7 @@ import pytest +from rhodecode.events import UserPermissionsChange from rhodecode.lib.utils2 import StrictAttributeDict from rhodecode.tests.events.conftest import EventCatcher @@ -97,7 +98,7 @@ def test_vcs_repo_push_event_serialize(config_stub, repo_stub, scm_extras, Event def test_create_delete_repo_fires_events(backend): with EventCatcher() as event_catcher: repo = backend.create_repo() - assert event_catcher.events_types == [RepoPreCreateEvent, RepoCreateEvent] + assert event_catcher.events_types == [RepoPreCreateEvent, RepoCreateEvent, UserPermissionsChange] with EventCatcher() as event_catcher: RepoModel().delete(repo) diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py index 72fb4cf7..a0f306ec 100644 --- a/rhodecode/tests/models/test_pullrequest.py +++ b/rhodecode/tests/models/test_pullrequest.py @@ -127,7 +127,7 @@ class TestPullRequestModel(object): Session().commit() prs = PullRequestModel().get_awaiting_my_review( - pull_request.target_repo, user_id=pull_request.author.user_id) + pull_request.target_repo.repo_name, user_id=pull_request.author.user_id) assert isinstance(prs, list) assert len(prs) == 1 @@ -138,7 +138,7 @@ class TestPullRequestModel(object): Session().commit() pr_count = PullRequestModel().count_awaiting_my_review( - pull_request.target_repo, user_id=pull_request.author.user_id) + pull_request.target_repo.repo_name, user_id=pull_request.author.user_id) assert pr_count == 1 def test_delete_calls_cleanup_merge(self, pull_request):