Skip to content

Commit 0b5d69b

Browse files
committed
allow triggering deprecated behaviour for entire test_build_easyconfigs_in_parallel_gc3pie + catch deprecation warnings via mocked_stdout_stderr
1 parent f52adc6 commit 0b5d69b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/framework/parallelbuild.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
223223
print("GC3Pie not available, skipping test")
224224
return
225225

226+
self.allow_deprecated_behaviour()
227+
226228
# put GC3Pie config in place to use local host and fork/exec
227229
resourcedir = os.path.join(self.test_prefix, 'gc3pie')
228230
gc3pie_cfgfile = os.path.join(self.test_prefix, 'gc3pie_local.ini')
@@ -263,9 +265,8 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
263265
test_easyblocks_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sandbox')
264266
cmd = "PYTHONPATH=%s:%s:$PYTHONPATH eb %%(spec)s -df" % (topdir, test_easyblocks_path)
265267

266-
self.allow_deprecated_behaviour()
267-
build_easyconfigs_in_parallel(cmd, ordered_ecs, prepare_first=False)
268-
self.disallow_deprecated_behaviour()
268+
with self.mocked_stdout_stderr():
269+
build_easyconfigs_in_parallel(cmd, ordered_ecs, prepare_first=False)
269270

270271
toy_modfile = os.path.join(self.test_installpath, 'modules', 'all', 'toy', '0.0')
271272
if get_module_syntax() == 'Lua':
@@ -282,10 +283,9 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
282283
write_file(test_ecfile, ectxt)
283284
ecs = resolve_dependencies(process_easyconfig(test_ecfile), self.modtool)
284285

285-
self.allow_deprecated_behaviour()
286286
error = "1 jobs failed: toy-1.2.3"
287-
self.assertErrorRegex(EasyBuildError, error, build_easyconfigs_in_parallel, cmd, ecs, prepare_first=False)
288-
self.disallow_deprecated_behaviour()
287+
with self.mocked_stdout_stderr():
288+
self.assertErrorRegex(EasyBuildError, error, build_easyconfigs_in_parallel, cmd, ecs, prepare_first=False)
289289

290290
def test_submit_jobs(self):
291291
"""Test submit_jobs"""

0 commit comments

Comments
 (0)