Skip to content

Commit 84129f4

Browse files
committed
Refactor and made sure that prepare_env gets run
1 parent 135b0c0 commit 84129f4

2 files changed

Lines changed: 1 addition & 13 deletions

File tree

render_machine/render_context.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,6 @@ def get_next_conformance_tests_running_context(self):
278278

279279
def start_unittests_processing_in_conformance_tests(self):
280280
self.start_unittests_processing()
281-
self.conformance_tests_running_context.implementation_code_was_updated = False
282-
self.conformance_tests_running_context.regression_run_started = True
283-
self.conformance_tests_running_context = self.get_first_conformance_tests_running_context()
284281

285282
def finish_unittests_processing(self):
286283
existing_files = file_utils.list_all_text_files(self.build_folder)
@@ -370,9 +367,6 @@ def start_conformance_tests_processing(self):
370367
def finish_conformance_tests_processing(self):
371368
self.conformance_tests_running_context = None
372369

373-
def implementation_code_was_updated_in_conformance_tests(self) -> bool:
374-
return self.conformance_tests_running_context.implementation_code_was_updated
375-
376370
def start_conformance_tests_for_frid(self):
377371
if self.conformance_tests_running_context.regenerating_conformance_tests:
378372
if self.verbose:

render_machine/state_machine_config.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def get_action_result_triggers_map(self) -> Dict[str, str]:
130130
RunConformanceTests.FAILED_OUTCOME: triggers.MARK_CONFORMANCE_TESTS_FAILED,
131131
RunConformanceTests.UNRECOVERABLE_ERROR_OUTCOME: triggers.HANDLE_ERROR,
132132
FixConformanceTest.IMPLEMENTATION_CODE_NOT_UPDATED: triggers.MARK_CONFORMANCE_TESTS_READY,
133-
FixConformanceTest.IMPLEMENTATION_CODE_UPDATED: triggers.MARK_CONFORMANCE_TESTS_READY,
133+
FixConformanceTest.IMPLEMENTATION_CODE_UPDATED: triggers.MARK_UNIT_TESTS_READY,
134134
CommitConformanceTestsChanges.SUCCESSFUL_OUTCOME_IMPLEMENTATION_UPDATED: triggers.MARK_NEXT_CONFORMANCE_TESTS_POSTPROCESSING_STEP,
135135
CommitConformanceTestsChanges.SUCCESSFUL_OUTCOME_IMPLEMENTATION_NOT_UPDATED: triggers.PROCEED_FRID_PROCESSING,
136136
SummarizeConformanceTests.SUCCESSFUL_OUTCOME: triggers.MARK_NEXT_CONFORMANCE_TESTS_POSTPROCESSING_STEP,
@@ -397,12 +397,6 @@ def get_transitions(self) -> List[Dict[str, Any]]:
397397
"trigger": triggers.MARK_REGENERATION_OF_CONFORMANCE_TESTS,
398398
"dest": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TESTING_INITIALISED.value}",
399399
},
400-
{
401-
"source": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TEST_ENV_PREPARED.value}",
402-
"trigger": triggers.MOVE_TO_NEXT_CONFORMANCE_TEST,
403-
"dest": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.PROCESSING_UNIT_TESTS.value}",
404-
"conditions": ["should_run_unit_tests", "implementation_code_was_updated_in_conformance_tests"],
405-
},
406400
{
407401
"source": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TEST_ENV_PREPARED.value}",
408402
"trigger": triggers.MOVE_TO_NEXT_CONFORMANCE_TEST,

0 commit comments

Comments
 (0)