Skip to content

Commit

Permalink
Merge branch 'ci/fix_multiprocessing_case_tester' into 'master'
Browse files Browse the repository at this point in the history
ci: fix: pexpect.buffer can't be kept between processes

Closes IDFCI-1618

See merge request espressif/esp-idf!22458
  • Loading branch information
hfudev committed Feb 22, 2023
2 parents 25cb9b3 + 38c292c commit e74fc68
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions tools/ci/idf_unity_tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def _wait_multi_dev_case_finish(self, timeout: int = 60) -> None:
else:
raise TimeoutError('Wait case to finish timeout')

def _start_sub_case_thread(self, dev_res: MultiDevResource, case: UnittestMenuCase, sub_case_index: int, timeout: int = 60) -> None:
def _start_sub_case_process(self, dev_res: MultiDevResource, case: UnittestMenuCase, sub_case_index: int, timeout: int = 60) -> None:
"""
Start the thread monitoring on the corresponding dut of the sub-case
"""
Expand Down Expand Up @@ -339,8 +339,8 @@ def run_multi_dev_case(self, case: UnittestMenuCase, reset: bool = False, timeou
index = int(sub_case['index'], 10)
else:
index = sub_case['index']
self._start_sub_case_thread(dev_res=self.group[index - 1], case=case,
sub_case_index=index, timeout=timeout)
self._start_sub_case_process(dev_res=self.group[index - 1], case=case,
sub_case_index=index, timeout=timeout)
# Waiting all the devices to finish their test cases
self._wait_multi_dev_case_finish(timeout=timeout)

Expand Down Expand Up @@ -381,4 +381,6 @@ def run_case(self, case: UnittestMenuCase, reset: bool = False, timeout: int = 6
elif case.type == 'multi_stage':
self.run_multi_stage_case(case, reset, timeout=_timeout)
elif case.type == 'multi_device':
self.run_multi_dev_case(case, reset, timeout=_timeout)
# here we always do a hard reset between test cases
# since the buffer can't be kept between test cases (which run in different processes)
self.run_multi_dev_case(case, reset=True, timeout=_timeout)

0 comments on commit e74fc68

Please sign in to comment.