Просмотр исходного кода

Merge branch 'bugfix/fix_bug_of_openthread_ci' into 'master'

openthread CI: disable host join group check in openthread ci cases

See merge request espressif/esp-idf!23096
Shu Chen 2 лет назад
Родитель
Сommit
0ebf798730
2 измененных файлов с 2 добавлено и 11 удалено
  1. 0 8
      examples/openthread/ot_ci_function.py
  2. 2 3
      examples/openthread/pytest_otbr.py

+ 0 - 8
examples/openthread/ot_ci_function.py

@@ -274,14 +274,6 @@ def thread_is_joined_group(dut:IdfDut) -> bool:
     return False
 
 
-def host_joined_group(group:str='') -> bool:
-    interface_name = get_host_interface_name()
-    command = 'netstat -g | grep ' + str(interface_name)
-    out_str = subprocess.getoutput(command)
-    print('groups:\n', str(out_str))
-    return group in str(out_str)
-
-
 class udp_parameter:
 
     def __init__(self, udp_type:str='', addr:str='::', port:int=5090, group:str='', init_flag:bool=False, timeout:float=15.0, udp_bytes:bytes=b''):

+ 2 - 3
examples/openthread/pytest_otbr.py

@@ -73,7 +73,7 @@ default_cli_ot_para = ocf.thread_parameter('router', '', '', '', False)
 @pytest.mark.esp32h2
 @pytest.mark.esp32c6
 @pytest.mark.openthread_br
-@pytest.mark.flaky(reruns=0, reruns_delay=1)
+@pytest.mark.flaky(reruns=1, reruns_delay=1)
 @pytest.mark.parametrize(
     'config, count, app_path, target', [
         ('rcp|cli_h2|br', 3,
@@ -141,7 +141,7 @@ def formBasicWiFiThreadNetwork(br:IdfDut, cli:IdfDut) -> None:
 @pytest.mark.esp32h2
 @pytest.mark.esp32c6
 @pytest.mark.openthread_br
-@pytest.mark.flaky(reruns=0, reruns_delay=1)
+@pytest.mark.flaky(reruns=1, reruns_delay=1)
 @pytest.mark.parametrize(
     'config, count, app_path, target', [
         ('rcp|cli_h2|br', 3,
@@ -261,7 +261,6 @@ def test_multicast_forwarding_B(Init_interface:bool, dut: Tuple[IdfDut, IdfDut,
         while not myudp.init_flag:
             if (time.time() - start_time) > 10:
                 assert False
-        assert ocf.host_joined_group('ff04::125')
         for num in range(0, 3):
             command = 'udp send ff04::125 5090 hello' + str(num)
             cli.write(command)