Split example_tests with Example_WIFI tag group into Example_OTA and Example_Protocols

2021-03-25 15:20:30 +05:30
parent d14661eaa3
commit 0a395134d4
30 changed files with 53 additions and 41 deletions
--- a/examples/protocols/asio/chat_client/asio_chat_client_test.py
+++ b/examples/protocols/asio/chat_client/asio_chat_client_test.py
@@ -44,7 +44,7 @@ def chat_server_sketch(my_ip):
    print('server closed')


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_asio_chat_client(env, extra_data):
    """
    steps: |
--- a/examples/protocols/asio/chat_server/asio_chat_server_test.py
+++ b/examples/protocols/asio/chat_server/asio_chat_server_test.py
@@ -5,7 +5,7 @@ import socket
 import ttfw_idf


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_asio_chat_server(env, extra_data):
    """
    steps: |
--- a/examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py
+++ b/examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py
@@ -5,7 +5,7 @@ import socket
 import ttfw_idf


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_asio_tcp_server(env, extra_data):
    """
    steps: |
--- a/examples/protocols/asio/udp_echo_server/asio_udp_server_test.py
+++ b/examples/protocols/asio/udp_echo_server/asio_udp_server_test.py
@@ -5,7 +5,7 @@ import socket
 import ttfw_idf


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_asio_udp_server(env, extra_data):
    """
    steps: |
--- a/examples/protocols/cbor/example_test.py
+++ b/examples/protocols/cbor/example_test.py
@@ -6,7 +6,7 @@ import textwrap
 import ttfw_idf


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_cbor(env, extra_data):

    dut = env.get_dut('cbor', 'examples/protocols/cbor')
--- a/examples/protocols/esp_local_ctrl/example_test.py
+++ b/examples/protocols/esp_local_ctrl/example_test.py
@@ -7,7 +7,7 @@ import sys
 import ttfw_idf


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_esp_local_ctrl(env, extra_data):

    rel_project_path = os.path.join('examples', 'protocols', 'esp_local_ctrl')
--- a/examples/protocols/http_server/advanced_tests/http_server_advanced_test.py
+++ b/examples/protocols/http_server/advanced_tests/http_server_advanced_test.py
@@ -35,7 +35,7 @@ from tiny_test_fw import Utility
 # features to this component.


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_http_server_advanced(env, extra_data):
    # Acquire DUT
    dut1 = env.get_dut('http_server', 'examples/protocols/http_server/advanced_tests', dut_class=ttfw_idf.ESP32DUT)
--- a/examples/protocols/http_server/file_serving/http_server_file_serving_test.py
+++ b/examples/protocols/http_server/file_serving/http_server_file_serving_test.py
@@ -25,7 +25,7 @@ from idf_http_server_test import adder as client
 from tiny_test_fw import Utility


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_http_server_file_serving(env, extra_data):  # type: (tiny_test_fw.Env.Env, None) -> None # pylint: disable=unused-argument
    # Acquire DUT
    dut1 = env.get_dut('http file_serving', 'examples/protocols/http_server/file_serving', dut_class=ttfw_idf.ESP32DUT)
--- a/examples/protocols/http_server/persistent_sockets/http_server_persistence_test.py
+++ b/examples/protocols/http_server/persistent_sockets/http_server_persistence_test.py
@@ -30,7 +30,7 @@ from tiny_test_fw import Utility
 # > make print_flash_cmd | tail -n 1 > build/download.config


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_http_server_persistence(env, extra_data):
    # Acquire DUT
    dut1 = env.get_dut('http_server', 'examples/protocols/http_server/persistent_sockets',
--- a/examples/protocols/http_server/simple/http_server_simple_test.py
+++ b/examples/protocols/http_server/simple/http_server_simple_test.py
@@ -62,7 +62,7 @@ class http_client_thread(threading.Thread):
 # > make print_flash_cmd | tail -n 1 > build/download.config


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_http_server_simple(env, extra_data):
    # Acquire DUT
    dut1 = env.get_dut('http_server', 'examples/protocols/http_server/simple', dut_class=ttfw_idf.ESP32DUT)
@@ -129,7 +129,7 @@ def test_examples_protocol_http_server_simple(env, extra_data):
    dut1.expect('Found URL query => ' + query, timeout=30)


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_http_server_lru_purge_enable(env, extra_data):
    # Acquire DUT
    dut1 = env.get_dut('http_server', 'examples/protocols/http_server/simple', dut_class=ttfw_idf.ESP32DUT)
--- a/examples/protocols/http_server/ws_echo_server/ws_server_example_test.py
+++ b/examples/protocols/http_server/ws_echo_server/ws_server_example_test.py
@@ -53,7 +53,7 @@ class WsClient:
        return self.ws.send(data)


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_http_ws_echo_server(env, extra_data):
    # Acquire DUT
    dut1 = env.get_dut('http_server', 'examples/protocols/http_server/ws_echo_server', dut_class=ttfw_idf.ESP32DUT)
--- a/examples/protocols/https_server/simple/example_test.py
+++ b/examples/protocols/https_server/simple/example_test.py
@@ -46,7 +46,7 @@ server_cert_pem = '-----BEGIN CERTIFICATE-----\n'\
 success_response = '<h1>Hello Secure World!</h1>'


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_https_server_simple(env, extra_data):  # type: (tiny_test_fw.Env.Env, None) -> None # pylint: disable=unused-argument
    """
    steps: |
--- a/examples/protocols/https_server/wss_server/wss_server_example_test.py
+++ b/examples/protocols/https_server/wss_server/wss_server_example_test.py
@@ -117,7 +117,7 @@ def test_multiple_client_keep_alive_and_async_response(ip, port, ca_file):  # ty
        t.join()


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_https_wss_server(env, extra_data):  # type: (tiny_test_fw.Env.Env, None) -> None # pylint: disable=unused-argument

    # Acquire DUT
--- a/examples/protocols/https_x509_bundle/example_test.py
+++ b/examples/protocols/https_x509_bundle/example_test.py
@@ -4,7 +4,7 @@ import re
 import ttfw_idf


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI', ignore=True)
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols', ignore=True)
 def test_examples_protocol_https_x509_bundle(env, extra_data):
    """
    steps: |
--- a/examples/protocols/icmp_echo/example_test.py
+++ b/examples/protocols/icmp_echo/example_test.py
@@ -6,7 +6,7 @@ import re
 import ttfw_idf


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_icmp_echo(env, extra_data):

    dut = env.get_dut('icmp_echo', 'examples/protocols/icmp_echo')
--- a/examples/protocols/mdns/mdns_example_test.py
+++ b/examples/protocols/mdns/mdns_example_test.py
@@ -87,7 +87,7 @@ def mdns_server(esp_host):
            continue


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_mdns(env, extra_data):
    global stop_mdns_server
    """
--- a/examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
+++ b/examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
@@ -58,7 +58,7 @@ def on_message(client, userdata, msg):
    message_log += 'Received data:' + msg.topic + ' ' + payload + '\n'


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_mqtt_ssl(env, extra_data):
    broker_url = ''
    broker_port = 0
--- a/examples/protocols/mqtt/tcp/mqtt_tcp_example_test.py
+++ b/examples/protocols/mqtt/tcp/mqtt_tcp_example_test.py
@@ -53,7 +53,7 @@ def mqqt_server_sketch(my_ip, port):
    print('server closed')


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_mqtt_qos1(env, extra_data):
    global msgid
    """
--- a/examples/protocols/mqtt/ws/mqtt_ws_example_test.py
+++ b/examples/protocols/mqtt/ws/mqtt_ws_example_test.py
@@ -39,7 +39,7 @@ def on_message(client, userdata, msg):
    message_log += 'Received data:' + msg.topic + ' ' + payload + '\n'


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_mqtt_ws(env, extra_data):
    broker_url = ''
    broker_port = 0
--- a/examples/protocols/mqtt/wss/mqtt_wss_example_test.py
+++ b/examples/protocols/mqtt/wss/mqtt_wss_example_test.py
@@ -40,7 +40,7 @@ def on_message(client, userdata, msg):
    message_log += 'Received data:' + msg.topic + ' ' + payload + '\n'


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_mqtt_wss(env, extra_data):
    broker_url = ''
    broker_port = 0
--- a/examples/protocols/sntp/example_test.py
+++ b/examples/protocols/sntp/example_test.py
@@ -7,7 +7,7 @@ import ttfw_idf
 from tiny_test_fw import Utility


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_sntp(env, extra_data):

    dut = env.get_dut('sntp', 'examples/protocols/sntp')
--- a/examples/protocols/sockets/tcp_client/example_test.py
+++ b/examples/protocols/sockets/tcp_client/example_test.py
@@ -85,7 +85,7 @@ class TcpServer:
                break


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_socket_tcpclient(env, extra_data):
    """
    steps:
--- a/examples/protocols/sockets/tcp_server/example_test.py
+++ b/examples/protocols/sockets/tcp_server/example_test.py
@@ -46,7 +46,7 @@ def tcp_client(address, payload):
    return data.decode()


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_socket_tcpserver(env, extra_data):
    MESSAGE = 'Data to ESP'
    """
--- a/examples/protocols/sockets/udp_client/example_test.py
+++ b/examples/protocols/sockets/udp_client/example_test.py
@@ -78,7 +78,7 @@ class UdpServer:
                break


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_socket_udpclient(env, extra_data):
    """
    steps:
--- a/examples/protocols/sockets/udp_server/example_test.py
+++ b/examples/protocols/sockets/udp_server/example_test.py
@@ -44,7 +44,7 @@ def udp_client(address, payload):
    return reply.decode()


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_socket_udpserver(env, extra_data):
    MESSAGE = 'Data to ESP'
    """
--- a/examples/protocols/websocket/example_test.py
+++ b/examples/protocols/websocket/example_test.py
@@ -97,7 +97,7 @@ def test_recv_long_msg(dut, websocket, msg_len, repeats):
                            \nreceived: {}\nwith length {}'.format(send_msg, len(send_msg), recv_msg, len(recv_msg)))


-@ttfw_idf.idf_example_test(env_tag='Example_WIFI')
+@ttfw_idf.idf_example_test(env_tag='Example_WIFI_Protocols')
 def test_examples_protocol_websocket(env, extra_data):
    """
    steps: