This is an automated email from the ASF dual-hosted git repository. brondsem pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit c4dc91d985746c8ffa6164e6a0bf6b7fb4f0b015 Author: Dillon Walls <dillon.wa...@slashdotmedia.com> AuthorDate: Fri Apr 8 21:20:35 2022 +0000 [#8246] Upgrade mock 3.0.5 -> 4.0.3, and its deps: six mock 3.0.5 -> 4.0.3 six 1.16.0 -> no upgrade --- ForgeImporters/forgeimporters/github/tests/test_code.py | 4 +++- ForgeSVN/forgesvn/tests/model/test_repository.py | 2 +- requirements.txt | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ForgeImporters/forgeimporters/github/tests/test_code.py b/ForgeImporters/forgeimporters/github/tests/test_code.py index 0530cd6c0..d86d16031 100644 --- a/ForgeImporters/forgeimporters/github/tests/test_code.py +++ b/ForgeImporters/forgeimporters/github/tests/test_code.py @@ -35,6 +35,9 @@ with_git = with_tool(test_project_with_repo, 'git', 'src', 'git') class TestGitHubRepoImporter(TestCase): + def setUp(self): + setup_unit_test() + def _make_project(self, gh_proj_name=None): project = Mock() project.get_tool_data.side_effect = lambda *args: gh_proj_name @@ -44,7 +47,6 @@ class TestGitHubRepoImporter(TestCase): @patch('forgeimporters.github.code.g') @patch('forgeimporters.github.code.GitHubProjectExtractor') def test_import_tool_happy_path(self, ghpe, g, M): - setup_unit_test() ghpe.return_value.get_repo_url.return_value = 'http://remote/clone/url/' p = self._make_project(gh_proj_name='myproject') u = Mock(name='c.user') diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py index 607335462..8451b4341 100644 --- a/ForgeSVN/forgesvn/tests/model/test_repository.py +++ b/ForgeSVN/forgesvn/tests/model/test_repository.py @@ -703,7 +703,7 @@ class _TestWithRepo(_Test): c.project.install_app('svn', 'test1') h.set_context('test', 'test1', neighborhood='Projects') self.repo = M.Repository(name='test1', tool='svn') - self.repo._impl = mock.Mock(spec=M.RepositoryImplementation()) + self.repo._impl = mock.Mock() self.repo._impl.shorthand_for_commit = M.RepositoryImplementation.shorthand_for_commit self.repo._impl.url_for_commit = ( lambda *a, **kw: M.RepositoryImplementation.url_for_commit( diff --git a/requirements.txt b/requirements.txt index f75b191f2..0549496e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -91,7 +91,7 @@ markupsafe==2.0.1 # webhelpers2 ming==0.11.2 # via -r requirements.in -mock==3.0.5 +mock==4.0.3 # via -r requirements.in https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d9265133e995fa.zip#egg=oauth2 # via -r requirements.in @@ -174,7 +174,6 @@ six==1.16.0 # formencode # html5lib # ming - # mock # paste # pastescript # python-dateutil