feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/ttfw_print_debug_exception' into 'master'

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

See merge request espressif/esp-idf!8222
This commit is contained in:
Anton Maklakov
2020-04-06 15:35:18 +08:00
parent 7d0f1536e4 e57dbf7c27
commit d3c301cc99
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/protocols/http_server/ws_echo_server/ws_server_example_test.py
View File

@@ -114,8 +114,8 @@ def test_examples_protocol_http_ws_echo_server(env, extra_data):
# Parse IP address of STA # Parse IP address of STA
Utility.console_log("Waiting to connect with AP") 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_ip = dut1.expect(re.compile(r"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_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 IP : " + got_ip)
Utility.console_log("Got Port : " + got_port) Utility.console_log("Got Port : " + got_port)

4
tools/ci/python_packages/tiny_test_fw/Env.py
View File

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