Skip to content

Commit 55694e7

Browse files
authored
Fix recursion reporting in build_testapps (#1432)
1 parent f6f3c77 commit 55694e7

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

scripts/gha/build_testapps.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,8 @@ def perform_in_editor_tests(dir_helper, retry_on_license_check=True, remaining_r
640640
logging.info("License check caused assembly reload. Retrying tests.")
641641
open_process.kill()
642642
# Don't count this against the remaining_retries amount, since the test didn't fail
643-
perform_in_editor_tests(dir_helper, retry_on_license_check=False,
643+
return perform_in_editor_tests(dir_helper, retry_on_license_check=False,
644644
remaining_retries=remaining_retries)
645-
return
646645
open_process.kill()
647646
logging.info("Finished running playmode tests")
648647

@@ -651,18 +650,17 @@ def perform_in_editor_tests(dir_helper, retry_on_license_check=True, remaining_r
651650
if results.passes and not results.fails: # Success
652651
logging.info(results.summary)
653652
else: # Failed
653+
logging.info("Test failed. Summary:\n%s", results.summary)
654654
if remaining_retries > 0:
655-
logging.info("Test failed, but will retry %d more times" % remaining_retries)
656-
perform_in_editor_tests(dir_helper, retry_on_license_check=retry_on_license_check,
655+
logging.info("Retrying %d more times" % remaining_retries)
656+
return perform_in_editor_tests(dir_helper, retry_on_license_check=retry_on_license_check,
657657
remaining_retries=remaining_retries-1)
658-
return
659658
raise RuntimeError(results.summary)
660659
else: # Generally caused by timeout or crash
661660
if remaining_retries > 0:
662661
logging.info("Test timed out or crashed, but will retry %d more times" % remaining_retries)
663-
perform_in_editor_tests(dir_helper, retry_on_license_check=retry_on_license_check,
662+
return perform_in_editor_tests(dir_helper, retry_on_license_check=retry_on_license_check,
664663
remaining_retries=remaining_retries-1)
665-
return
666664
raise RuntimeError(
667665
"Tests did not finish running. Log tail:\n" + results.summary)
668666

0 commit comments

Comments
 (0)