Skip to content

Commit 003895b

Browse files
authored
Merge pull request #4952 from branfosj/fix_iter_cnt
do not determine number of iterations in easyblock constructor (which is too early), but in `run_all_steps`
2 parents 8be26fa + bcad7b2 commit 003895b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

easybuild/framework/easyblock.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def __init__(self, ec, logfile=None):
312312
self._init_log()
313313

314314
# number of iterations
315-
self.iter_cnt = self.det_iter_cnt()
315+
self.iter_cnt = -1
316316

317317
# try and use the specified group (if any)
318318
group_name = build_option('group')
@@ -4793,6 +4793,7 @@ def run_all_steps(self, run_test_cases):
47934793
if self.cfg['stop'] == 'cfg':
47944794
return True
47954795

4796+
self.iter_cnt = self.det_iter_cnt()
47964797
steps = self.get_steps(run_test_cases=run_test_cases, iteration_count=self.iter_cnt)
47974798

47984799
# figure out how many steps will actually be run (not be skipped)

test/framework/easyblock.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,9 +1173,11 @@ def test_handle_iterate_opts(self):
11731173

11741174
ec = process_easyconfig(test_ec)[0]
11751175
eb = get_easyblock_instance(ec)
1176+
eb.iter_cnt = eb.det_iter_cnt()
11761177

11771178
# check initial state
11781179
self.assertEqual(eb.iter_idx, 0)
1180+
self.assertEqual(eb.iter_cnt, 3)
11791181
self.assertEqual(eb.iter_opts, {})
11801182
self.assertEqual(eb.cfg.iterating, False)
11811183
self.assertEqual(eb.cfg.iterate_options, [])

0 commit comments

Comments
 (0)