Skip to content

Commit e5950d8

Browse files
committed
Use correct module for errors_found_in_log
1 parent 2845905 commit e5950d8

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

easybuild/framework/easyblock.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
from easybuild.framework.easyconfig.style import MAX_LINE_LENGTH
6363
from easybuild.framework.easyconfig.tools import get_paths_for
6464
from easybuild.framework.easyconfig.templates import TEMPLATE_NAMES_EASYBLOCK_RUN_STEP, template_constant_dict
65-
from easybuild.tools import config, filetools
65+
from easybuild.tools import config, run
6666
from easybuild.tools.build_details import get_build_stats
6767
from easybuild.tools.build_log import EasyBuildError, dry_run_msg, dry_run_warning, dry_run_set_dirs
6868
from easybuild.tools.build_log import print_error, print_msg, print_warning
@@ -3044,7 +3044,7 @@ def build_and_install_one(ecdict, init_env):
30443044

30453045
# restore original environment, and then sanitize it
30463046
_log.info("Resetting environment")
3047-
filetools.errors_found_in_log = 0
3047+
run.errors_found_in_log = 0
30483048
restore_env(init_env)
30493049
sanitize_env()
30503050

@@ -3195,9 +3195,9 @@ def build_and_install_one(ecdict, init_env):
31953195
print_msg("%s: Installation %s %s (took %s)" % (summary, ended, succ, req_time), log=_log, silent=silent)
31963196

31973197
# check for errors
3198-
if filetools.errors_found_in_log > 0:
3198+
if run.errors_found_in_log > 0:
31993199
print_msg("WARNING: %d possible error(s) were detected in the "
3200-
"build logs, please verify the build." % filetools.errors_found_in_log,
3200+
"build logs, please verify the build." % run.errors_found_in_log,
32013201
_log, silent=silent)
32023202

32033203
if app.postmsg:

test/framework/utilities.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ def setUp(self):
177177
self.env_path = os.environ.get('PATH')
178178
self.env_pythonpath = os.environ.get('PYTHONPATH')
179179

180-
self.modtool = modules_tool()
181-
self.reset_modulepath([os.path.join(testdir, 'modules')])
182-
reset_module_caches()
180+
#self.modtool = modules_tool()
181+
#self.reset_modulepath([os.path.join(testdir, 'modules')])
182+
#reset_module_caches()
183183

184184
def allow_deprecated_behaviour(self):
185185
"""Restore EasyBuild version to what it was originally, to allow triggering deprecated behaviour."""

0 commit comments

Comments
 (0)