Преглед изворни кода

Merge branch 'bugfix/socket_example_ipv6_randomfail' into 'master'

socket examples: fix random ci failure on reading ipv6 address

See merge request espressif/esp-idf!8686
Anton Maklakov пре 5 година
родитељ
комит
f9a5794cba

+ 2 - 1
examples/protocols/sockets/tcp_server/example_test.py

@@ -65,7 +65,8 @@ def test_examples_protocol_socket(env, extra_data):
     dut1.start_app()
 
     ipv4 = dut1.expect(re.compile(r" IPv4 address: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)"), timeout=30)[0]
-    ipv6 = dut1.expect(re.compile(r" IPv6 address: ([0-9A-Fa-f\:]+)"), timeout=30)[0]
+    ipv6_r = r':'.join((r'[0-9a-fA-F]{4}',) * 8)    # expect all 8 octets from IPv6 (assumes it's printed in the long form)
+    ipv6 = dut1.expect(re.compile(r' IPv6 address: ({})'.format(ipv6_r)), timeout=30)[0]
     print("Connected with IPv4={} and IPv6={}".format(ipv4, ipv6))
 
     # test IPv4

+ 2 - 1
examples/protocols/sockets/udp_server/example_test.py

@@ -63,7 +63,8 @@ def test_examples_protocol_socket(env, extra_data):
     dut1.start_app()
 
     ipv4 = dut1.expect(re.compile(r" IPv4 address: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)"), timeout=30)[0]
-    ipv6 = dut1.expect(re.compile(r" IPv6 address: ([0-9A-Fa-f\:]+)"), timeout=30)[0]
+    ipv6_r = r':'.join((r'[0-9a-fA-F]{4}',) * 8)    # expect all 8 octets from IPv6 (assumes it's printed in the long form)
+    ipv6 = dut1.expect(re.compile(r' IPv6 address: ({})'.format(ipv6_r)), timeout=30)[0]
     print("Connected with IPv4={} and IPv6={}".format(ipv4, ipv6))
 
     # test IPv4