espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-23 15:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

websocket: updated example to use local websocket echo server

Browse Source
This commit is contained in:
Suren Gabrielyan
2022-10-31 20:53:37 +04:00
parent 698fb3ae00
commit 55dc56462f
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/target-test.yml vendored
View File

@ -193,7 +193,7 @@ jobs:
components/esp_websocket_client/examples/build/config/sdkconfig.json components/esp_websocket_client/examples/build/config/sdkconfig.json
if-no-files-found: error if-no-files-found: error
run-target: run-target-websocket:
name: Run Websocket Example Test on target name: Run Websocket Example Test on target
needs: build_websocket needs: build_websocket
strategy: strategy:
@ -206,9 +206,6 @@ jobs:
- ESP32-ETHERNET-KIT - ESP32-ETHERNET-KIT
# Skip running on forks since it won't have access to secrets # Skip running on forks since it won't have access to secrets
if: github.repository == 'espressif/esp-protocols' if: github.repository == 'espressif/esp-protocols'
container:
image: python:3.7-buster
options: --privileged # Privileged mode has access to serial ports
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
@ -225,8 +222,7 @@ jobs:
- name: Run Example Test on target - name: Run Example Test on target
working-directory: components/esp_websocket_client/examples working-directory: components/esp_websocket_client/examples
run: | run: |
cp sdkconfig.ci sdkconfig.defaults python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}.xml --target=${{ matrix.idf_target }}
pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}.xml --target=${{ matrix.idf_target }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
if: always() if: always()
with: with:

4
components/esp_websocket_client/examples/pytest_websocket.py
View File

@ -101,7 +101,7 @@ def test_examples_protocol_websocket(dut):
data = json.loads(json_string) data = json.loads(json_string)
match = dut.expect( match = dut.expect(
re.compile(b'Json=([a-zA-Z0-9]*).*')).group(0).decode()[5:] re.compile(b'Json=({[a-zA-Z0-9]*).*}')).group(0).decode()[5:]
if match == str(data[0]): if match == str(data[0]):
print('Sent message and received message are equal') print('Sent message and received message are equal')
else: else:
@ -122,7 +122,7 @@ def test_examples_protocol_websocket(dut):
recv_msg = '' recv_msg = ''
while len(recv_msg) < msg_len: while len(recv_msg) < msg_len:
match = dut.expect(re.compile( match = dut.expect(re.compile(
b'Received=([a-zA-Z0-9]*).*')).group(1).decode() b'Received=([a-zA-Z0-9]*).*\n')).group(1).decode()
recv_msg += match recv_msg += match
if recv_msg == send_msg: if recv_msg == send_msg:

5
components/esp_websocket_client/examples/sdkconfig.ci
View File

@ -1,6 +1,5 @@
CONFIG_WEBSOCKET_URI_FROM_STDIN=n CONFIG_WEBSOCKET_URI_FROM_STDIN=y
CONFIG_WEBSOCKET_URI_FROM_STRING=y CONFIG_WEBSOCKET_URI_FROM_STRING=n
CONFIG_WEBSOCKET_URI="ws://echo.websocket.events"
CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y
CONFIG_EXAMPLE_CONNECT_WIFI=n CONFIG_EXAMPLE_CONNECT_WIFI=n
CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y