From d1ac112b0ce27769613a966ad7816875863b7ef8 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 16 Mar 2021 10:40:33 +0100 Subject: [PATCH] [FIX] Mock's patch contextmanager now requires exc_info like arguments Fixes ``` File "/home/user/mr.developer/.tox/py38/lib/python3.8/site-packages/mock/mock.py", line 1545, in __exit__ return exit_stack.__exit__(*exc_info) File "/usr/lib/python3.8/contextlib.py", line 483, in __exit__ received_exc = exc_details[0] is not None IndexError: tuple index out of rang ``` when running tests --- src/mr/developer/tests/test_commands.py | 6 ++--- src/mr/developer/tests/test_extension.py | 4 ++-- src/mr/developer/tests/test_git.py | 4 ++-- src/mr/developer/tests/test_git_submodules.py | 22 +++++++++---------- src/mr/developer/tests/test_mercurial.py | 2 +- src/mr/developer/tests/test_svn.py | 2 +- src/mr/developer/tests/utils.py | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/mr/developer/tests/test_commands.py b/src/mr/developer/tests/test_commands.py index 95b6b2c..2263c6d 100644 --- a/src/mr/developer/tests/test_commands.py +++ b/src/mr/developer/tests/test_commands.py @@ -92,7 +92,7 @@ def testDeactivateDeactivatedPackage(self, cmd, develop): try: cmd(args) finally: - _logger.__exit__() + _logger.__exit__(None, None, None) assert develop.config.develop == dict( bar=False, foo='auto', @@ -107,7 +107,7 @@ def testDeactivateActivatedPackage(self, cmd, develop): try: cmd(args) finally: - _logger.__exit__() + _logger.__exit__(None, None, None) assert develop.config.develop == dict( bar=False, foo='auto', @@ -123,7 +123,7 @@ def testDeactivateAutoCheckoutPackage(self, cmd, develop): try: cmd(args) finally: - _logger.__exit__() + _logger.__exit__(None, None, None) assert develop.config.develop == dict( foo=False, ham='auto') diff --git a/src/mr/developer/tests/test_extension.py b/src/mr/developer/tests/test_extension.py index bdb8005..0ebdb80 100644 --- a/src/mr/developer/tests/test_extension.py +++ b/src/mr/developer/tests/test_extension.py @@ -271,7 +271,7 @@ def testDevelopSafeName(self, buildout, extension): (develop, develeggs, versions) = extension.get_develop_info() finally: - _exists.__exit__() + _exists.__exit__(None, None, None) assert buildout['versions'] == { 'pkg.foo-bar': '', 'pkg.bar-foo': '1.0'} @@ -296,7 +296,7 @@ def testDevelopSourcesMix(self, buildout, extension): exists().return_value = True (develop, develeggs, versions) = extension.get_develop_info() finally: - _exists.__exit__() + _exists.__exit__(None, None, None) assert develop == ['/normal/develop', '/develop/with/slash/', 'src/pkg.bar'] def testMissingSourceSection(self, buildout, extension): diff --git a/src/mr/developer/tests/test_git.py b/src/mr/developer/tests/test_git.py index dc62ee9..8fb77ca 100644 --- a/src/mr/developer/tests/test_git.py +++ b/src/mr/developer/tests/test_git.py @@ -139,7 +139,7 @@ def testUpdateWithoutRevisionPin(self, develop, mkgitrepo, src, capsys): assert captured.out == "~ A egg\n ## master...origin/master\n\n" finally: - _log.__exit__() + _log.__exit__(None, None, None) def testUpdateVerbose(self, develop, mkgitrepo, src, capsys): from mr.developer.commands import CmdCheckout @@ -178,7 +178,7 @@ def testUpdateVerbose(self, develop, mkgitrepo, src, capsys): assert captured.out == "~ A egg\n ## master...origin/master\n\n" finally: - _log.__exit__() + _log.__exit__(None, None, None) def testDepthOption(self, mkgitrepo, src, tempdir): from mr.developer.develop import develop diff --git a/src/mr/developer/tests/test_git_submodules.py b/src/mr/developer/tests/test_git_submodules.py index 0fb28e7..5e116c9 100644 --- a/src/mr/developer/tests/test_git_submodules.py +++ b/src/mr/developer/tests/test_git_submodules.py @@ -33,7 +33,7 @@ def testCheckoutWithSubmodule(self, develop, mkgitrepo, src): ('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}), ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testCheckoutWithTwoSubmodules(self, develop, mkgitrepo, src): """ @@ -71,7 +71,7 @@ def testCheckoutWithTwoSubmodules(self, develop, mkgitrepo, src): ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {}), ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_b_name,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testUpdateWithSubmodule(self, develop, mkgitrepo, src): """ @@ -102,7 +102,7 @@ def testUpdateWithSubmodule(self, develop, mkgitrepo, src): ('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}), ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) submodule_b_name = 'submodule_b' submodule_b = mkgitrepo(submodule_b_name) @@ -119,7 +119,7 @@ def testUpdateWithSubmodule(self, develop, mkgitrepo, src): ('info', ("Switching to branch 'master'.",), {}), ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_b_name,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testCheckoutWithSubmodulesOptionNever(self, develop, mkgitrepo, src): """ @@ -151,7 +151,7 @@ def testCheckoutWithSubmodulesOptionNever(self, develop, mkgitrepo, src): assert log.method_calls == [ ('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testCheckoutWithSubmodulesOptionNeverSourceAlways(self, develop, mkgitrepo, src): """ @@ -199,7 +199,7 @@ def testCheckoutWithSubmodulesOptionNeverSourceAlways(self, develop, mkgitrepo, ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {}), ('info', ("Cloned 'egg2' with git from '%s'." % egg2.url,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testCheckoutWithSubmodulesOptionAlwaysSourceNever(self, develop, mkgitrepo, src): """ @@ -246,7 +246,7 @@ def testCheckoutWithSubmodulesOptionAlwaysSourceNever(self, develop, mkgitrepo, ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {}), ('info', ("Cloned 'egg2' with git from '%s'." % egg2.url,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testUpdateWithSubmoduleCheckout(self, develop, mkgitrepo, src): """ @@ -278,7 +278,7 @@ def testUpdateWithSubmoduleCheckout(self, develop, mkgitrepo, src): ('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}), ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) submodule_b_name = 'submodule_b' submodule_b = mkgitrepo(submodule_b_name) @@ -294,7 +294,7 @@ def testUpdateWithSubmoduleCheckout(self, develop, mkgitrepo, src): ('info', ("Updated 'egg' with git.",), {}), ('info', ("Switching to branch 'master'.",), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testUpdateWithSubmoduleDontUpdatePreviousSubmodules(self, develop, mkgitrepo, src): """ @@ -326,7 +326,7 @@ def testUpdateWithSubmoduleDontUpdatePreviousSubmodules(self, develop, mkgitrepo ('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}), ('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) repo = GitRepo(src['egg/%s' % submodule_name]) repo.setup_user() @@ -341,4 +341,4 @@ def testUpdateWithSubmoduleDontUpdatePreviousSubmodules(self, develop, mkgitrepo ('info', ("Updated 'egg' with git.",), {}), ('info', ("Switching to branch 'master'.",), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) diff --git a/src/mr/developer/tests/test_mercurial.py b/src/mr/developer/tests/test_mercurial.py index 85f1519..9125a43 100644 --- a/src/mr/developer/tests/test_mercurial.py +++ b/src/mr/developer/tests/test_mercurial.py @@ -43,7 +43,7 @@ def testUpdateWithoutRevisionPin(self, develop, src, tempdir): ('info', ("Updated 'egg' with mercurial.",), {}), ('info', ("Switched 'egg' to default.",), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testUpdateWithRevisionPin(self, develop, src, tempdir): from mr.developer.commands import CmdCheckout diff --git a/src/mr/developer/tests/test_svn.py b/src/mr/developer/tests/test_svn.py index 4e7f52b..242cebe 100644 --- a/src/mr/developer/tests/test_svn.py +++ b/src/mr/developer/tests/test_svn.py @@ -46,7 +46,7 @@ def testUpdateWithoutRevisionPin(self, develop, src, tempdir): ('info', ("Checked out 'egg' with subversion.",), {}), ('info', ("Updated 'egg' with subversion.",), {})] finally: - _log.__exit__() + _log.__exit__(None, None, None) def testUpdateWithRevisionPin(self, develop, src, tempdir): from mr.developer.commands import CmdCheckout diff --git a/src/mr/developer/tests/utils.py b/src/mr/developer/tests/utils.py index a5aa409..80586d3 100644 --- a/src/mr/developer/tests/utils.py +++ b/src/mr/developer/tests/utils.py @@ -101,7 +101,7 @@ def popen(cmd, echo=True, echo2=True, env=None, cwd=None): try: lines = tee(process, echo) finally: - bt.__exit__() + bt.__exit__(None, None, None) return process.returncode, lines