Skip to content

Commit 89a8394

Browse files
committed
Use an EB 5.0 PR for cmakemake test for include-easyblock
1 parent fa02d4d commit 89a8394

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/framework/options.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3933,7 +3933,7 @@ def test_github_xxx_include_easyblocks_from_pr(self):
39333933

39343934
args = [
39353935
'--include-easyblocks=%s/*.py' % self.test_prefix, # this shouldn't interfere
3936-
'--include-easyblocks-from-pr=3399', # a PR for CMakeMake easyblock
3936+
'--include-easyblocks-from-pr=3677', # a PR for CMakeMake easyblock
39373937
'--list-easyblocks=detailed',
39383938
'--unittest-file=%s' % self.logfile,
39393939
'--github-user=%s' % GITHUB_TEST_ACCOUNT,
@@ -3947,7 +3947,7 @@ def test_github_xxx_include_easyblocks_from_pr(self):
39473947
logtxt = read_file(self.logfile)
39483948

39493949
self.assertFalse(stderr)
3950-
self.assertEqual(stdout, "== easyblock cmakemake.py included from PR #3399\n")
3950+
self.assertEqual(stdout, "== easyblock cmakemake.py included from PR #3677\n")
39513951

39523952
# easyblock included from pr is found
39533953
path_pattern = os.path.join(self.test_prefix, '.*', 'included-easyblocks-.*', 'easybuild', 'easyblocks')
@@ -3977,7 +3977,7 @@ def test_github_xxx_include_easyblocks_from_pr(self):
39773977
# including the same easyblock twice should work and give priority to the one from the PR
39783978
args = [
39793979
'--include-easyblocks=%s/*.py' % self.test_prefix,
3980-
'--include-easyblocks-from-pr=3399',
3980+
'--include-easyblocks-from-pr=3677',
39813981
'--list-easyblocks=detailed',
39823982
'--unittest-file=%s' % self.logfile,
39833983
'--github-user=%s' % GITHUB_TEST_ACCOUNT,
@@ -3991,9 +3991,9 @@ def test_github_xxx_include_easyblocks_from_pr(self):
39913991
logtxt = read_file(self.logfile)
39923992

39933993
expected = "WARNING: One or more easyblocks included from multiple locations: "
3994-
expected += "cmakemake.py (the one(s) from PR #3399 will be used)"
3994+
expected += "cmakemake.py (the one(s) from PR #3677 will be used)"
39953995
self.assertEqual(stderr.strip(), expected)
3996-
self.assertEqual(stdout, "== easyblock cmakemake.py included from PR #3399\n")
3996+
self.assertEqual(stdout, "== easyblock cmakemake.py included from PR #3677\n")
39973997

39983998
# easyblock included from pr is found
39993999
path_pattern = os.path.join(self.test_prefix, '.*', 'included-easyblocks-.*', 'easybuild', 'easyblocks')

0 commit comments

Comments
 (0)