Sfoglia il codice sorgente

Merge branch 'bugfix/ttfw_print_debug_exception' into 'master'

ci: ttfw ignored a test failure if exception in debug log

See merge request espressif/esp-idf!8222
Anton Maklakov 5 anni fa
parent
commit
d3c301cc99

+ 2 - 2
examples/protocols/http_server/ws_echo_server/ws_server_example_test.py

@@ -114,8 +114,8 @@ def test_examples_protocol_http_ws_echo_server(env, extra_data):
 
     # Parse IP address of STA
     Utility.console_log("Waiting to connect with AP")
-    got_ip = dut1.expect(re.compile(r"(?:[\s\S]*)IPv4 address: (\d+.\d+.\d+.\d+)"), timeout=60)[0]
-    got_port = dut1.expect(re.compile(r"(?:[\s\S]*)Starting server on port: '(\d+)'"), timeout=60)[0]
+    got_ip = dut1.expect(re.compile(r"IPv4 address: (\d+.\d+.\d+.\d+)"), timeout=60)[0]
+    got_port = dut1.expect(re.compile(r"Starting server on port: '(\d+)'"), timeout=60)[0]
 
     Utility.console_log("Got IP   : " + got_ip)
     Utility.console_log("Got Port : " + got_port)

+ 2 - 2
tools/ci/python_packages/tiny_test_fw/Env.py

@@ -185,9 +185,9 @@ class Env(object):
         dut_close_errors = []
         for dut_name in self.allocated_duts:
             dut = self.allocated_duts[dut_name]["dut"]
-            if dut_debug:
-                dut.print_debug_info()
             try:
+                if dut_debug:
+                    dut.print_debug_info()
                 dut.close()
             except Exception as e:
                 dut_close_errors.append(e)