Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion test/easyblocks/init_easyblocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
from easybuild.framework.easyconfig.tools import get_paths_for
from easybuild.tools import config
from easybuild.tools.filetools import write_file
from easybuild.tools.options import set_tmpdir
from easybuild.tools.module_naming_scheme import GENERAL_CLASS
from easybuild.tools.run import parse_log_for_error, run_cmd, run_cmd_qa
from easybuild.tools.environment import modify_env, read_environment
Expand All @@ -59,7 +60,7 @@ class InitTest(TestCase):
'valid_stops': [x[0] for x in EasyBlock.get_steps()],
}
config.init_build_options(build_options=build_options)
config.set_tmpdir()
set_tmpdir()
del eb_go

def writeEC(self, easyblock, name='foo', version='1.3.2', extratxt=''):
Expand Down
3 changes: 2 additions & 1 deletion test/easyblocks/module_only.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
from easybuild.tools import config
from easybuild.tools.filetools import write_file
from easybuild.tools.module_naming_scheme import GENERAL_CLASS
from easybuild.tools.options import set_tmpdir


TMPDIR = tempfile.gettempdir()
Expand Down Expand Up @@ -164,7 +165,7 @@ def suite():
'valid_stops': [x[0] for x in EasyBlock.get_steps()],
}
config.init_build_options(build_options=build_options)
config.set_tmpdir()
set_tmpdir()

# dynamically generate a separate test for each of the available easyblocks
easyblocks_path = get_paths_for("easyblocks")[0]
Expand Down
2 changes: 1 addition & 1 deletion test/easyblocks/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from vsc.utils import fancylogger

from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.config import set_tmpdir
from easybuild.tools.options import set_tmpdir

import test.easyblocks.general as g
import test.easyblocks.init_easyblocks as i
Expand Down