Skip to content

Commit e435de3

Browse files
remove FRID-walk machinery superseded by whole-suite conformance runs
Deletes the per-FRID regression iteration (get_first/next running-context walk, _get_next_test_to_run, _has_reached_implementation_frid, _should_run_current_frid_tests) now that regression runs one whole suite per module.
1 parent 36d09ce commit e435de3

1 file changed

Lines changed: 0 additions & 99 deletions

File tree

‎render_machine/render_context.py‎

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -183,78 +183,6 @@ def start_unittests_processing(self):
183183
self.unit_tests_running_context = UnitTestsRunningContext(fix_attempts=0)
184184
self.run_state.increment_unittest_batch_id()
185185

186-
def _get_first_frid_conformance_test_running_context(self, module: PlainModule | None):
187-
conformance_tests_running_context = self.conformance_tests_running_context
188-
189-
if module is None:
190-
conformance_tests_running_context.current_testing_module_name = self.module_name
191-
if not conformance_tests_running_context.conformance_tests_json_has_module_populated(
192-
conformance_tests_running_context.current_testing_module_name
193-
):
194-
conformance_tests_running_context.set_conformance_tests_json(
195-
conformance_tests_running_context.current_testing_module_name,
196-
{},
197-
)
198-
else:
199-
conformance_tests_running_context.current_testing_module_name = module.module_name
200-
conformance_tests_running_context.set_conformance_tests_json(
201-
conformance_tests_running_context.current_testing_module_name,
202-
self.conformance_tests.get_conformance_tests_json(
203-
conformance_tests_running_context.current_testing_module_name
204-
),
205-
)
206-
207-
if module is None:
208-
conformance_tests_running_context.current_testing_frid = plain_spec.get_first_frid(self.plain_source_tree)
209-
else:
210-
conformance_tests_running_context.current_testing_frid = next(
211-
iter(
212-
conformance_tests_running_context.get_conformance_tests_json(
213-
conformance_tests_running_context.current_testing_module_name
214-
)
215-
)
216-
)
217-
218-
return conformance_tests_running_context
219-
220-
def get_first_conformance_tests_running_context(self):
221-
if self.required_modules is None or len(self.required_modules) == 0:
222-
return self._get_first_frid_conformance_test_running_context(None)
223-
else:
224-
return self._get_first_frid_conformance_test_running_context(self.required_modules[0])
225-
226-
def get_next_conformance_tests_running_context(self):
227-
conformance_tests_running_context = self.conformance_tests_running_context
228-
if conformance_tests_running_context.current_testing_module_name == self.module_name:
229-
conformance_tests_running_context.current_testing_frid = plain_spec.get_next_frid(
230-
self.plain_source_tree,
231-
self.conformance_tests_running_context.current_testing_frid,
232-
)
233-
else:
234-
all_frids = list(
235-
conformance_tests_running_context.get_conformance_tests_json(
236-
conformance_tests_running_context.current_testing_module_name
237-
).keys()
238-
)
239-
current_index = all_frids.index(conformance_tests_running_context.current_testing_frid)
240-
if current_index + 1 < len(all_frids):
241-
conformance_tests_running_context.current_testing_frid = all_frids[current_index + 1]
242-
else:
243-
next_module_index = -1
244-
for i, required_module in enumerate(self.required_modules):
245-
if required_module.module_name == conformance_tests_running_context.current_testing_module_name:
246-
next_module_index = i + 1
247-
break
248-
249-
if next_module_index < len(self.required_modules):
250-
conformance_tests_running_context = self._get_first_frid_conformance_test_running_context(
251-
self.required_modules[next_module_index]
252-
)
253-
else:
254-
conformance_tests_running_context = self._get_first_frid_conformance_test_running_context(None)
255-
256-
return conformance_tests_running_context
257-
258186
def finish_unittests_processing(self):
259187
existing_files = file_utils.list_all_text_files(self.build_folder)
260188

@@ -314,15 +242,6 @@ def finish_conformance_tests_processing(self):
314242

315243
# ========== Helper Methods for Conformance Test Execution ==========
316244

317-
def _should_run_current_frid_tests(self) -> bool:
318-
"""Check if we should run/continue testing the current FRID."""
319-
ctx = self.conformance_tests_running_context
320-
return (
321-
ctx.execution_phase == TestExecutionPhase.TESTING_CURRENT_FRID
322-
and ctx.current_testing_module_name == self.module_name
323-
and ctx.current_testing_frid == ctx.frid_being_implemented
324-
)
325-
326245
def _has_more_acceptance_test_phases(self) -> bool:
327246
"""Check if there are more acceptance test phases to run."""
328247
ctx = self.conformance_tests_running_context
@@ -346,15 +265,6 @@ def _start_regression_phase(self):
346265
ctx.execution_phase = TestExecutionPhase.RUNNING_REGRESSION
347266
ctx.regression_module_index = None # Will be advanced by _get_next_regression_module
348267

349-
def _get_next_test_to_run(self):
350-
"""Determine which test to run next based on current phase."""
351-
ctx = self.conformance_tests_running_context
352-
353-
if ctx.current_testing_frid is None:
354-
return self.get_first_conformance_tests_running_context()
355-
else:
356-
return self.get_next_conformance_tests_running_context()
357-
358268
def _module_has_conformance_tests(self, module_name: str) -> bool:
359269
return len(self.conformance_tests.get_conformance_tests_json(module_name)) > 0
360270

@@ -427,15 +337,6 @@ def route_conformance_failure_to_frid(self, conformance_tests_issue: str) -> str
427337

428338
return evidence + failure_attribution.format_other_frids_note(implicated_frids, target_frid)
429339

430-
def _has_reached_implementation_frid(self) -> bool:
431-
"""Check if regression has reached the FRID being implemented."""
432-
ctx = self.conformance_tests_running_context
433-
return (
434-
ctx.execution_phase == TestExecutionPhase.RUNNING_REGRESSION
435-
and ctx.current_testing_module_name == self.module_name
436-
and (ctx.current_testing_frid is None or ctx.current_testing_frid == ctx.frid_being_implemented)
437-
)
438-
439340
def _setup_test_specifications(self):
440341
"""Load specifications for the current test."""
441342
ctx = self.conformance_tests_running_context

0 commit comments

Comments
 (0)