Skip to content

Commit

Permalink
Fix test comparing YEB and EB files
Browse files Browse the repository at this point in the history
Use the same templates in the compared EC and YEB files.
  • Loading branch information
Flamefire committed Jul 5, 2022
1 parent bc1af2f commit bb6f129
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ description: |
toolchain: {name: intel, version: 2018a}
toolchainopts: {pic: True, opt: True, optarch: True}

source_urls: ['http://www.python.org/ftp/python/%(version)s/']
source_urls: ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
sources: [*SOURCE_TGZ]

# python needs bzip2 to build the bz2 package
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
_internal_variables_:
- &versionstr 3081002
- &versionstr '%(version_major)s081002'

easyblock: ConfigureMake

Expand Down
4 changes: 2 additions & 2 deletions test/framework/yeb.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ def test_parse_yeb(self):
ec_eb = EasyConfig(ec_file)

for key in sorted(ec_yeb.asdict()):
eb_val = ec_eb[key]
yeb_val = ec_yeb[key]
eb_val = ec_eb.get_ref(key)
yeb_val = ec_yeb.get_ref(key)
if key == 'description':
# multi-line string is always terminated with '\n' in YAML, so strip it off
yeb_val = yeb_val.strip()
Expand Down

0 comments on commit bb6f129

Please sign in to comment.