Skip to content

Commit 93305b0

Browse files
author
Samuel Moors
committed
try to fix
1 parent 066d140 commit 93305b0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

easybuild/framework/easyblock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2433,7 +2433,7 @@ def det_iter_cnt(self):
24332433

24342434
# we need to take into account that builddependencies is always a list
24352435
# we're only iterating over it if it's a list of lists
2436-
builddeps = self.cfg['builddependencies']
2436+
builddeps = self.cfg.get_ref('builddependencies')
24372437
if all(isinstance(x, list) for x in builddeps):
24382438
iter_opt_counts.append(len(builddeps))
24392439

test/framework/easyblock.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ def test_handle_iterate_opts(self):
11911191
stdout = self.get_stdout()
11921192
self.mock_stdout(False)
11931193
self.assertEqual(eb.iter_idx, 0)
1194-
self.assertEqual(stdout, "== starting iteration #0 ...\n")
1194+
self.assertEqual(stdout, "== starting iteration number 1/3 ...\n")
11951195
self.assertEqual(eb.cfg.iterating, True)
11961196
self.assertEqual(eb.cfg.iterate_options, ['configopts'])
11971197
self.assertEqual(eb.cfg['configopts'], "--opt1 --anotheropt")
@@ -1205,7 +1205,7 @@ def test_handle_iterate_opts(self):
12051205
stdout = self.get_stdout()
12061206
self.mock_stdout(False)
12071207
self.assertEqual(eb.iter_idx, 1)
1208-
self.assertEqual(stdout, "== starting iteration #1 ...\n")
1208+
self.assertEqual(stdout, "== starting iteration number 2/3 ...\n")
12091209
self.assertEqual(eb.cfg.iterating, True)
12101210
self.assertEqual(eb.cfg.iterate_options, ['configopts'])
12111211
# preconfigopts should have been restored (https://github.com/easybuilders/easybuild-framework/pull/4848)
@@ -1218,7 +1218,7 @@ def test_handle_iterate_opts(self):
12181218
stdout = self.get_stdout()
12191219
self.mock_stdout(False)
12201220
self.assertEqual(eb.iter_idx, 2)
1221-
self.assertEqual(stdout, "== starting iteration #2 ...\n")
1221+
self.assertEqual(stdout, "== starting iteration number 3/3 ...\n")
12221222
self.assertEqual(eb.cfg.iterating, True)
12231223
self.assertEqual(eb.cfg.iterate_options, ['configopts'])
12241224
self.assertEqual(eb.cfg['configopts'], "--opt3 --optbis")

0 commit comments

Comments
 (0)