espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci/fix_multiprocessing_case_tester' into 'master'

Browse Source 
ci: fix: pexpect.buffer can't be kept between processes

Closes IDFCI-1618

See merge request espressif/esp-idf!22458
This commit is contained in:
Fu Hanxi
2023-02-22 09:17:24 +08:00
parent 25cb9b3f0e 38c292c7bf
commit e74fc68c3a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/ci/idf_unity_tester.py
View File

@@ -218,7 +218,7 @@ class MultiDevCaseTester(BaseTester):
else: else:
raise TimeoutError('Wait case to finish timeout') 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 Start the thread monitoring on the corresponding dut of the sub-case
""" """
@@ -339,8 +339,8 @@ class MultiDevCaseTester(BaseTester):
index = int(sub_case['index'], 10) index = int(sub_case['index'], 10)
else: else:
index = sub_case['index'] index = sub_case['index']
self._start_sub_case_thread(dev_res=self.group[index - 1], case=case, self._start_sub_case_process(dev_res=self.group[index - 1], case=case,
sub_case_index=index, timeout=timeout) sub_case_index=index, timeout=timeout)
# Waiting all the devices to finish their test cases # Waiting all the devices to finish their test cases
self._wait_multi_dev_case_finish(timeout=timeout) self._wait_multi_dev_case_finish(timeout=timeout)
@@ -381,4 +381,6 @@ class CaseTester(NormalCaseTester, MultiStageCaseTester, MultiDevCaseTester):
elif case.type == 'multi_stage': elif case.type == 'multi_stage':
self.run_multi_stage_case(case, reset, timeout=_timeout) self.run_multi_stage_case(case, reset, timeout=_timeout)
elif case.type == 'multi_device': 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)