Skip to content

Commit 1ea42a2

Browse files
committed
also test template_constant_dict with easyconfig dict obtained via EasyConfigParser
1 parent 0887a14 commit 1ea42a2

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

test/framework/easyconfig.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
from easybuild.framework.easyconfig.easyconfig import letter_dir_for, process_easyconfig, resolve_template
5353
from easybuild.framework.easyconfig.easyconfig import triage_easyconfig_params, verify_easyconfig_filename
5454
from easybuild.framework.easyconfig.licenses import License, LicenseGPLv3
55-
from easybuild.framework.easyconfig.parser import fetch_parameters_from_easyconfig
55+
from easybuild.framework.easyconfig.parser import EasyConfigParser, fetch_parameters_from_easyconfig
5656
from easybuild.framework.easyconfig.templates import template_constant_dict, to_template_str
5757
from easybuild.framework.easyconfig.style import check_easyconfigs_style
5858
from easybuild.framework.easyconfig.tools import categorize_files_by_type, check_sha256_checksums, dep_graph
@@ -2582,11 +2582,10 @@ def test_template_constant_dict(self):
25822582
test_ec = os.path.join(self.test_prefix, 'test.eb')
25832583
write_file(test_ec, toy_ec_txt)
25842584

2585-
ec = EasyConfig(test_ec)
2585+
# only perform shallow/quick parse (as is done in list_software function)
2586+
ec = EasyConfigParser(filename=test_ec).get_config_dict()
25862587

25872588
expected = {
2588-
'bitbucket_account': 'toy',
2589-
'github_account': 'toy',
25902589
'javamajver': '1',
25912590
'javashortver': '1.8',
25922591
'javaver': '1.8.0_221',
@@ -2596,15 +2595,13 @@ def test_template_constant_dict(self):
25962595
'toolchain_name': 'system',
25972596
'toolchain_version': 'system',
25982597
'nameletterlower': 't',
2599-
'parallel': None,
26002598
'pymajver': '3',
26012599
'pyshortver': '3.7',
26022600
'pyver': '3.7.2',
26032601
'version': '0.01',
26042602
'version_major': '0',
26052603
'version_major_minor': '0.01',
26062604
'version_minor': '01',
2607-
'versionprefix': '',
26082605
'versionsuffix': '-deps',
26092606
}
26102607
res = template_constant_dict(ec)

0 commit comments

Comments
 (0)