Skip to content

Commit 4bd89f3

Browse files
committed
Merge pull request #1 from boegel/tsv_skip_checksum_verification
fix broken tests w.r.t. tweak_one changes
2 parents 3a6a8c6 + f136347 commit 4bd89f3

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

test/framework/easyconfig.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@ def test_tweaking(self):
367367
'toolchain_name': tcname,
368368
'patches': new_patches[:1],
369369
'homepage': homepage,
370-
'foo': "bar"
371370
}
372371

373372
tweak_one(self.eb_file, tweaked_fn, tweaks)
@@ -515,7 +514,7 @@ def test_obtain_easyconfig(self):
515514
'toolchain_name': tcname,
516515
'toolchain_version': tcver,
517516
'version': ver,
518-
'foo': 'bar123'
517+
'start_dir': 'bar123'
519518
})
520519
res = obtain_ec_for(specs, [self.ec_dir], None)
521520
self.assertEqual(res[1], "%s-%s-%s-%s%s.eb" % (name, ver, tcname, tcver, suff))
@@ -526,11 +525,16 @@ def test_obtain_easyconfig(self):
526525
self.assertEqual(ec['version'], specs['version'])
527526
self.assertEqual(ec['versionsuffix'], specs['versionsuffix'])
528527
self.assertEqual(ec['toolchain'], {'name': tcname, 'version': tcver})
529-
# can't check for key 'foo', because EasyConfig ignores parameter names it doesn't know about
530-
txt = read_file(res[1])
531-
self.assertTrue(re.search('foo = "%s"' % specs['foo'], txt))
528+
self.assertEqual(ec['start_dir'], specs['start_dir'])
532529
os.remove(res[1])
533530

531+
specs.update({
532+
'foo': 'bar123'
533+
})
534+
self.assertErrorRegex(EasyBuildError, "Unkown easyconfig parameter: foo",
535+
obtain_ec_for, specs, [self.ec_dir], None)
536+
del specs['foo']
537+
534538
# should pick correct version, i.e. not newer than what's specified, if a choice needs to be made
535539
ver = '3.14'
536540
specs.update({'version': ver})

0 commit comments

Comments
 (0)