Skip to content

Commit

Permalink
Merge pull request #205 from StefanRijnhart/fix/adapt_to_mock_api_cha…
Browse files Browse the repository at this point in the history 
…nges

[FIX] Mock's patch contextmanager now requires exc_info like arguments
  • Loading branch information
@fschulze
fschulze authored Mar 16, 2021
2 parents 1ff9a84 + d1ac112 commit 51501af
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions src/mr/developer/tests/test_commands.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions src/mr/developer/tests/test_extension.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand All @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions src/mr/developer/tests/test_git.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions src/mr/developer/tests/test_git_submodules.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down Expand Up @@ -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):
"""
Expand Down Expand Up @@ -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)
Expand All @@ -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):
"""
Expand Down Expand Up @@ -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):
"""
Expand Down Expand Up @@ -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):
"""
Expand Down Expand Up @@ -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):
"""
Expand Down Expand Up @@ -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)
Expand All @@ -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):
"""
Expand Down Expand Up @@ -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()
Expand All @@ -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)
2 changes: 1 addition & 1 deletion src/mr/developer/tests/test_mercurial.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/mr/developer/tests/test_svn.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/mr/developer/tests/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit 51501af

Please sign in to comment.