Skip to content

use --dry-run in test_easystack_basic to avoid downloading of binutils sources #3521

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
ocaisa merged 2 commits into from
Dec 7, 2020
Merged

use --dry-run in test_easystack_basic to avoid downloading of binutils sources #3521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc91f0c
use --dry-run in test_easystack_basic (to avoid downloading of binuti…
boegel Dec 7, 2020
84911f8
sort easyconfig filenames in log message for parsed easystack to fix …
boegel Dec 7, 2020
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
2 changes: 1 addition & 1 deletion easybuild/framework/easystack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def parse_easystack(filepath):

general_options = easystack.get_general_options()

_log.debug("EasyStack parsed. Proceeding to install these Easyconfigs: \n'%s'" % "',\n'".join(easyconfig_names))
_log.debug("EasyStack parsed. Proceeding to install these Easyconfigs: %s" % ", ".join(easyconfig_names))
if len(general_options) != 0:
_log.debug("General options for installation are: \n%s" % str(general_options))
else:
Expand Down
15 changes: 7 additions & 8 deletions test/framework/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5620,20 +5620,19 @@ def test_easystack_basic(self):
topdir = os.path.dirname(os.path.abspath(__file__))
toy_easystack = os.path.join(topdir, 'easystacks', 'test_easystack_basic.yaml')

args = ['--easystack', toy_easystack, '--stop', '--debug', '--experimental']
args = ['--easystack', toy_easystack, '--debug', '--experimental', '--dry-run']
stdout = self.eb_main(args, do_build=True, raise_error=True)
patterns = [
r"[\S\s]*INFO Building from easystack:[\S\s]*",
r"[\S\s]*DEBUG EasyStack parsed\. Proceeding to install these Easyconfigs:.*?[\n]"
r"[\S\s]*INFO building and installing binutils/2\.25-GCCcore-4\.9\.3[\S\s]*",
r"[\S\s]*INFO building and installing binutils/2\.26-GCCcore-4\.9\.3[\S\s]*",
r"[\S\s]*INFO building and installing toy/0\.0-gompi-2018a-test[\S\s]*",
r"[\S\s]*INFO COMPLETED: Installation STOPPED successfully[\S\s]*",
r"[\S\s]*INFO Build succeeded for 3 out of 3[\S\s]*"
r"[\S\s]*DEBUG EasyStack parsed\. Proceeding to install these Easyconfigs: "
r"binutils-2.25-GCCcore-4.9.3.eb, binutils-2.26-GCCcore-4.9.3.eb, toy-0.0-gompi-2018a-test.eb",
r"\* \[ \] .*/test_ecs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb \(module: binutils/2.25-GCCcore-4.9.3\)",
r"\* \[ \] .*/test_ecs/b/binutils/binutils-2.26-GCCcore-4.9.3.eb \(module: binutils/2.26-GCCcore-4.9.3\)",
r"\* \[ \] .*/test_ecs/t/toy/toy-0.0-gompi-2018a-test.eb \(module: toy/0.0-gompi-2018a-test\)",
]
for pattern in patterns:
regex = re.compile(pattern)
self.assertTrue(regex.match(stdout), "Pattern '%s' should be found in: %s" % (regex.pattern, stdout))
self.assertTrue(regex.search(stdout), "Pattern '%s' should be found in: %s" % (regex.pattern, stdout))

def test_easystack_wrong_structure(self):
"""Test for --easystack <easystack.yaml> when yaml easystack has wrong structure"""
Expand Down