Skip to content

Commit 51501af

Browse files
fschulzefschulze
authored
Merge pull request #205 from StefanRijnhart/fix/adapt_to_mock_api_changes
[FIX] Mock's patch contextmanager now requires exc_info like arguments
2 parents 1ff9a84 + d1ac112 commit 51501af

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎src/mr/developer/tests/test_commands.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def testDeactivateDeactivatedPackage(self, cmd, develop):
9292
try:
9393
cmd(args)
9494
finally:
95-
_logger.__exit__()
95+
_logger.__exit__(None, None, None)
9696
assert develop.config.develop == dict(
9797
bar=False,
9898
foo='auto',
@@ -107,7 +107,7 @@ def testDeactivateActivatedPackage(self, cmd, develop):
107107
try:
108108
cmd(args)
109109
finally:
110-
_logger.__exit__()
110+
_logger.__exit__(None, None, None)
111111
assert develop.config.develop == dict(
112112
bar=False,
113113
foo='auto',
@@ -123,7 +123,7 @@ def testDeactivateAutoCheckoutPackage(self, cmd, develop):
123123
try:
124124
cmd(args)
125125
finally:
126-
_logger.__exit__()
126+
_logger.__exit__(None, None, None)
127127
assert develop.config.develop == dict(
128128
foo=False,
129129
ham='auto')

‎src/mr/developer/tests/test_extension.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def testDevelopSafeName(self, buildout, extension):
271271

272272
(develop, develeggs, versions) = extension.get_develop_info()
273273
finally:
274-
_exists.__exit__()
274+
_exists.__exit__(None, None, None)
275275
assert buildout['versions'] == {
276276
'pkg.foo-bar': '',
277277
'pkg.bar-foo': '1.0'}
@@ -296,7 +296,7 @@ def testDevelopSourcesMix(self, buildout, extension):
296296
exists().return_value = True
297297
(develop, develeggs, versions) = extension.get_develop_info()
298298
finally:
299-
_exists.__exit__()
299+
_exists.__exit__(None, None, None)
300300
assert develop == ['/normal/develop', '/develop/with/slash/', 'src/pkg.bar']
301301

302302
def testMissingSourceSection(self, buildout, extension):

‎src/mr/developer/tests/test_git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def testUpdateWithoutRevisionPin(self, develop, mkgitrepo, src, capsys):
139139
assert captured.out == "~ A egg\n ## master...origin/master\n\n"
140140

141141
finally:
142-
_log.__exit__()
142+
_log.__exit__(None, None, None)
143143

144144
def testUpdateVerbose(self, develop, mkgitrepo, src, capsys):
145145
from mr.developer.commands import CmdCheckout
@@ -178,7 +178,7 @@ def testUpdateVerbose(self, develop, mkgitrepo, src, capsys):
178178
assert captured.out == "~ A egg\n ## master...origin/master\n\n"
179179

180180
finally:
181-
_log.__exit__()
181+
_log.__exit__(None, None, None)
182182

183183
def testDepthOption(self, mkgitrepo, src, tempdir):
184184
from mr.developer.develop import develop

‎src/mr/developer/tests/test_git_submodules.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def testCheckoutWithSubmodule(self, develop, mkgitrepo, src):
3333
('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}),
3434
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})]
3535
finally:
36-
_log.__exit__()
36+
_log.__exit__(None, None, None)
3737

3838
def testCheckoutWithTwoSubmodules(self, develop, mkgitrepo, src):
3939
"""
@@ -71,7 +71,7 @@ def testCheckoutWithTwoSubmodules(self, develop, mkgitrepo, src):
7171
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {}),
7272
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_b_name,), {})]
7373
finally:
74-
_log.__exit__()
74+
_log.__exit__(None, None, None)
7575

7676
def testUpdateWithSubmodule(self, develop, mkgitrepo, src):
7777
"""
@@ -102,7 +102,7 @@ def testUpdateWithSubmodule(self, develop, mkgitrepo, src):
102102
('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}),
103103
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})]
104104
finally:
105-
_log.__exit__()
105+
_log.__exit__(None, None, None)
106106

107107
submodule_b_name = 'submodule_b'
108108
submodule_b = mkgitrepo(submodule_b_name)
@@ -119,7 +119,7 @@ def testUpdateWithSubmodule(self, develop, mkgitrepo, src):
119119
('info', ("Switching to branch 'master'.",), {}),
120120
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_b_name,), {})]
121121
finally:
122-
_log.__exit__()
122+
_log.__exit__(None, None, None)
123123

124124
def testCheckoutWithSubmodulesOptionNever(self, develop, mkgitrepo, src):
125125
"""
@@ -151,7 +151,7 @@ def testCheckoutWithSubmodulesOptionNever(self, develop, mkgitrepo, src):
151151
assert log.method_calls == [
152152
('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {})]
153153
finally:
154-
_log.__exit__()
154+
_log.__exit__(None, None, None)
155155

156156
def testCheckoutWithSubmodulesOptionNeverSourceAlways(self, develop, mkgitrepo, src):
157157
"""
@@ -199,7 +199,7 @@ def testCheckoutWithSubmodulesOptionNeverSourceAlways(self, develop, mkgitrepo,
199199
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {}),
200200
('info', ("Cloned 'egg2' with git from '%s'." % egg2.url,), {})]
201201
finally:
202-
_log.__exit__()
202+
_log.__exit__(None, None, None)
203203

204204
def testCheckoutWithSubmodulesOptionAlwaysSourceNever(self, develop, mkgitrepo, src):
205205
"""
@@ -246,7 +246,7 @@ def testCheckoutWithSubmodulesOptionAlwaysSourceNever(self, develop, mkgitrepo,
246246
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {}),
247247
('info', ("Cloned 'egg2' with git from '%s'." % egg2.url,), {})]
248248
finally:
249-
_log.__exit__()
249+
_log.__exit__(None, None, None)
250250

251251
def testUpdateWithSubmoduleCheckout(self, develop, mkgitrepo, src):
252252
"""
@@ -278,7 +278,7 @@ def testUpdateWithSubmoduleCheckout(self, develop, mkgitrepo, src):
278278
('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}),
279279
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})]
280280
finally:
281-
_log.__exit__()
281+
_log.__exit__(None, None, None)
282282

283283
submodule_b_name = 'submodule_b'
284284
submodule_b = mkgitrepo(submodule_b_name)
@@ -294,7 +294,7 @@ def testUpdateWithSubmoduleCheckout(self, develop, mkgitrepo, src):
294294
('info', ("Updated 'egg' with git.",), {}),
295295
('info', ("Switching to branch 'master'.",), {})]
296296
finally:
297-
_log.__exit__()
297+
_log.__exit__(None, None, None)
298298

299299
def testUpdateWithSubmoduleDontUpdatePreviousSubmodules(self, develop, mkgitrepo, src):
300300
"""
@@ -326,7 +326,7 @@ def testUpdateWithSubmoduleDontUpdatePreviousSubmodules(self, develop, mkgitrepo
326326
('info', ("Cloned 'egg' with git from '%s'." % egg.url,), {}),
327327
('info', ("Initialized 'egg' submodule at '%s' with git." % submodule_name,), {})]
328328
finally:
329-
_log.__exit__()
329+
_log.__exit__(None, None, None)
330330

331331
repo = GitRepo(src['egg/%s' % submodule_name])
332332
repo.setup_user()
@@ -341,4 +341,4 @@ def testUpdateWithSubmoduleDontUpdatePreviousSubmodules(self, develop, mkgitrepo
341341
('info', ("Updated 'egg' with git.",), {}),
342342
('info', ("Switching to branch 'master'.",), {})]
343343
finally:
344-
_log.__exit__()
344+
_log.__exit__(None, None, None)

‎src/mr/developer/tests/test_mercurial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def testUpdateWithoutRevisionPin(self, develop, src, tempdir):
4343
('info', ("Updated 'egg' with mercurial.",), {}),
4444
('info', ("Switched 'egg' to default.",), {})]
4545
finally:
46-
_log.__exit__()
46+
_log.__exit__(None, None, None)
4747

4848
def testUpdateWithRevisionPin(self, develop, src, tempdir):
4949
from mr.developer.commands import CmdCheckout

‎src/mr/developer/tests/test_svn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def testUpdateWithoutRevisionPin(self, develop, src, tempdir):
4646
('info', ("Checked out 'egg' with subversion.",), {}),
4747
('info', ("Updated 'egg' with subversion.",), {})]
4848
finally:
49-
_log.__exit__()
49+
_log.__exit__(None, None, None)
5050

5151
def testUpdateWithRevisionPin(self, develop, src, tempdir):
5252
from mr.developer.commands import CmdCheckout

‎src/mr/developer/tests/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def popen(cmd, echo=True, echo2=True, env=None, cwd=None):
101101
try:
102102
lines = tee(process, echo)
103103
finally:
104-
bt.__exit__()
104+
bt.__exit__(None, None, None)
105105
return process.returncode, lines
106106

107107

0 commit comments

Comments
 (0)