arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

filter weird characters from esp output to python (#6226)

Browse Source 
(this is an issue probably since we switched from esptool.exe to esptool.py)
This commit is contained in:
david gauchard 2019-06-25 21:45:33 +02:00 committed by Earle F. Philhower, III
parent 80e976d1f0
commit 7c184f4268
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/device/Makefile
View File

@ -34,12 +34,18 @@ all: count tests test_report
$(TEST_LIST): | virtualenv $(TEST_CONFIG) $(BUILD_DIR) $(HARDWARE_DIR) $(TEST_LIST): | virtualenv $(TEST_CONFIG) $(BUILD_DIR) $(HARDWARE_DIR)
tests: $(TEST_LIST) tests: showtestlist $(TEST_LIST)
showtestlist:
@echo "-------------------------------- test list:"
@echo $(TEST_LIST)
@echo "--------------------------------"
$(TEST_LIST): LOCAL_BUILD_DIR=$(BUILD_DIR)/$(notdir $@) $(TEST_LIST): LOCAL_BUILD_DIR=$(BUILD_DIR)/$(notdir $@)
$(TEST_LIST): $(TEST_LIST):
@echo Running $(words $(TEST_LIST)) tests @echo "--------------------------------"
@echo "Running test '$@' of $(words $(TEST_LIST)) tests"
$(SILENT)mkdir -p $(LOCAL_BUILD_DIR) $(SILENT)mkdir -p $(LOCAL_BUILD_DIR)
ifneq ("$(NO_BUILD)","1") ifneq ("$(NO_BUILD)","1")
@test -n "$(ARDUINO_IDE_PATH)" || (echo "Please export ARDUINO_IDE_PATH" && exit 1) @test -n "$(ARDUINO_IDE_PATH)" || (echo "Please export ARDUINO_IDE_PATH" && exit 1)
@ -85,7 +91,7 @@ ifneq ("$(NO_RUN)","1")
--port $(UPLOAD_PORT) \ --port $(UPLOAD_PORT) \
--baud $(UPLOAD_BAUD) \ --baud $(UPLOAD_BAUD) \
read_flash_status # reset read_flash_status # reset
@source $(BS_DIR)/virtualenv/bin/activate && \ $(SILENT)source $(BS_DIR)/virtualenv/bin/activate && \
$(PYTHON) $(BS_DIR)/runner.py \ $(PYTHON) $(BS_DIR)/runner.py \
$(RUNNER_DEBUG_FLAG) \ $(RUNNER_DEBUG_FLAG) \
-p $(UPLOAD_PORT) \ -p $(UPLOAD_PORT) \

5
tests/device/libraries/BSTest/runner.py
View File

@ -29,6 +29,7 @@ except:
import mock_decorators import mock_decorators
debug = False debug = False
#debug = True
sys.path.append(os.path.abspath(__file__)) sys.path.append(os.path.abspath(__file__))
@ -126,7 +127,7 @@ class BSTestRunner(object):
debug_print('test output was:') debug_print('test output was:')
debug_print(test_output.getvalue()) debug_print(test_output.getvalue())
if result == BSTestRunner.SUCCESS: if result == BSTestRunner.SUCCESS:
test_case.stdout = test_output.getvalue() test_case.stdout = filter(lambda c: ord(c) < 128, test_output.getvalue())
print('test "{}" passed'.format(name)) print('test "{}" passed'.format(name))
else: else:
print('test "{}" failed'.format(name)) print('test "{}" failed'.format(name))
@ -269,7 +270,7 @@ def main():
ts = run_tests(sp, name, mocks, env_vars) ts = run_tests(sp, name, mocks, env_vars)
if args.output: if args.output:
with open(args.output, "w") as f: with open(args.output, "w") as f:
TestSuite.to_file(f, [ts]) TestSuite.to_file(f, [ts], encoding='raw_unicode_escape')
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':