Skip to content

fix calling of step methods in regtest mode #1453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 2 commits into from
Nov 3, 2015
Merged

fix calling of step methods in regtest mode #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd5db31
fix calling of step methods in regtest
boegel Nov 1, 2015
97914f4
add unit test for --regtest
boegel Nov 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,7 +2366,7 @@ def perform_step(step, obj, method, logfile):
return get_easyblock_instance(obj)
else:
apploginfo(obj, "Running %s step" % step)
method(obj)
method(obj)()
except Exception, err: # catch all possible errors, also crashes in EasyBuild code itself
fullerr = str(err)
if not isinstance(err, EasyBuildError):
Expand Down Expand Up @@ -2413,7 +2413,7 @@ def perform_step(step, obj, method, logfile):
_log.info("Skipping step %s" % step_name)
else:
for step_method in step_methods:
method_name = '_'.join(step_method.func_code.co_names)
method_name = step_method(app).__name__
perform_step('_'.join([step_name, method_name]), app, step_method, applog)

# close log and move it
Expand Down
11 changes: 11 additions & 0 deletions test/framework/toy_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,17 @@ def test_package_skip(self):
toypkg = os.path.join(pkgpath, 'toy-0.0-eb-%s.1.rpm' % EASYBUILD_VERSION)
self.assertTrue(os.path.exists(toypkg), "%s is there" % toypkg)

def test_regtest(self):
"""Test use of --regtest."""
self.test_toy_build(extra_args=['--regtest', '--sequential'], verify=False)

# just check whether module exists
toy_module = os.path.join(self.test_installpath, 'modules', 'all', 'toy', '0.0')
msg = "module %s found" % toy_module
if get_module_syntax() == 'Lua':
toy_module += '.lua'
self.assertTrue(os.path.exists(toy_module), msg)


def suite():
""" return all the tests in this file """
Expand Down