Merge branch 'feature/pystyle_examples' into 'master'

examples: Fix Python coding style

See merge request idf/esp-idf!3881

.flake8

@@ -149,6 +149,8 @@ exclude =
         components/expat/expat,
         components/unity/unity,
         examples/build_system/cmake/import_lib/main/lib/tinyxml2
+    # autogenerated scripts
+        examples/provisioning/custom_config/components/custom_provisioning/python/custom_config_pb2.py,
     # temporary list (should be empty)
         components/app_update/dump_otadata.py,
         components/app_update/gen_empty_partition.py,
@@ -164,45 +166,9 @@ exclude =
         components/ulp/esp32ulp_mapgen.py,
         components/wifi_provisioning/python/wifi_config_pb2.py,
         components/wifi_provisioning/python/wifi_constants_pb2.py,
-        examples/peripherals/can/can_alert_and_recovery/example_test.py,
-        examples/peripherals/can/can_network/example_test.py,
-        examples/peripherals/can/can_self_test/example_test.py,
-        examples/peripherals/i2s_adc_dac/tools/generate_audio_file.py,
-        examples/peripherals/sdio/sdio_test.py,
-        examples/protocols/asio/chat_client/asio_chat_client_test.py,
-        examples/protocols/asio/chat_server/asio_chat_server_test.py,
-        examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py,
-        examples/protocols/asio/udp_echo_server/asio_udp_server_test.py,
-        examples/protocols/esp_http_client/esp_http_client_test.py,
-        examples/protocols/http_server/advanced_tests/http_server_advanced_test.py,
-        examples/protocols/http_server/advanced_tests/scripts/test.py,
-        examples/protocols/http_server/persistent_sockets/http_server_persistence_test.py,
-        examples/protocols/http_server/persistent_sockets/scripts/adder.py,
-        examples/protocols/http_server/simple/http_server_simple_test.py,
-        examples/protocols/http_server/simple/scripts/client.py,
-        examples/protocols/https_request/example_test.py,
-        examples/protocols/mdns/mdns_example_test.py,
-        examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py,
-        examples/protocols/mqtt/tcp/mqtt_tcp_example_test.py,
-        examples/protocols/mqtt/ws/mqtt_ws_example_test.py,
-        examples/protocols/mqtt/wss/mqtt_wss_example_test.py,
-        examples/protocols/sockets/scripts/tcpclient.py,
-        examples/protocols/sockets/scripts/tcpserver.py,
-        examples/protocols/sockets/scripts/udpclient.py,
-        examples/protocols/sockets/scripts/udpserver.py,
         examples/provisioning/ble_prov/ble_prov_test.py,
-        examples/provisioning/custom_config/components/custom_provisioning/python/custom_config_pb2.py,
         examples/provisioning/softap_prov/softap_prov_test.py,
         examples/provisioning/softap_prov/utils/wifi_tools.py,
-        examples/storage/parttool/example_test.py,
-        examples/system/cpp_exceptions/example_test.py,
-        examples/system/esp_event/default_event_loop/example_test.py,
-        examples/system/esp_event/user_event_loops/example_test.py,
-        examples/system/esp_timer/example_test.py,
-        examples/system/light_sleep/example_test.py,
-        examples/system/ota/otatool/example_test.py,
-        examples/wifi/iperf/iperf_test.py,
-        examples/wifi/iperf/test_report.py,
         tools/ci/apply_bot_filter.py,
         tools/cmake/convert_to_cmake.py,
         tools/esp_app_trace/apptrace_proc.py,

examples/peripherals/can/can_alert_and_recovery/example_test.py

@@ -1,21 +1,24 @@
 # Need Python 3 string formatting functions
 from __future__ import print_function
 
-import re
 import os
 import sys
+
+try:
+    import IDF
+except ImportError:
     # The test cause is dependent on the Tiny Test Framework. Ensure the
     # `TEST_FW_PATH` environment variable is set to `$IDF_PATH/tools/tiny-test-fw`
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-import TinyFW
     import IDF
 
 # CAN Self Test Example constants
 STR_EXPECT = ("CAN Alert and Recovery: Driver installed", "CAN Alert and Recovery: Driver uninstalled")
 EXPECT_TIMEOUT = 20
 
+
 @IDF.idf_example_test(env_tag='Example_CAN')
 def test_can_alert_and_recovery_example(env, extra_data):
     # Get device under test, flash and start example. "dut4" must be defined in EnvConfig
@@ -25,5 +28,6 @@ def test_can_alert_and_recovery_example(env, extra_data):
     for string in STR_EXPECT:
         dut.expect(string, timeout=EXPECT_TIMEOUT)
 
+
 if __name__ == '__main__':
     test_can_alert_and_recovery_example()

examples/peripherals/can/can_network/example_test.py

@@ -1,17 +1,17 @@
 # Need Python 3 string formatting functions
 from __future__ import print_function
 
-import re
 import os
 import sys
-import time
 from threading import Thread
+try:
+    import IDF
+except ImportError:
     # The test cause is dependent on the Tiny Test Framework. Ensure the
     # `TEST_FW_PATH` environment variable is set to `$IDF_PATH/tools/tiny-test-fw`
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-import TinyFW
     import IDF
 
 # Define tuple of strings to expect for each DUT.
@@ -19,6 +19,7 @@ master_expect = ("CAN Master: Driver installed", "CAN Master: Driver uninstalled
 slave_expect = ("CAN Slave: Driver installed", "CAN Slave: Driver uninstalled")
 listen_only_expect = ("CAN Listen Only: Driver installed", "Listen Only: Driver uninstalled")
 
+
 def dut_thread_callback(**kwargs):
     # Parse keyword arguments
     dut = kwargs['dut']             # Get DUT from kwargs
@@ -34,6 +35,7 @@ def dut_thread_callback(**kwargs):
     # Mark thread has run to completion without any exceptions
     result[0] = True
 
+
 @IDF.idf_example_test(env_tag='Example_CAN')
 def test_can_network_example(env, extra_data):
 
@@ -70,8 +72,9 @@ def test_can_network_example(env, extra_data):
 
     # check each thread ran to completion
     for result in results:
-        if result[0] != True:
+        if result[0] is not True:
             raise Exception("One or more threads did not run successfully")
 
+
 if __name__ == '__main__':
     test_can_network_example()

examples/peripherals/can/can_self_test/example_test.py

@@ -1,21 +1,24 @@
 # Need Python 3 string formatting functions
 from __future__ import print_function
 
-import re
 import os
 import sys
+try:
+    import IDF
+except ImportError:
     # The test cause is dependent on the Tiny Test Framework. Ensure the
     # `TEST_FW_PATH` environment variable is set to `$IDF_PATH/tools/tiny-test-fw`
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-import TinyFW
     import IDF
 
+
 # CAN Self Test Example constants
 STR_EXPECT = ("CAN Self Test: Driver installed", "CAN Self Test: Driver uninstalled")
 EXPECT_TIMEOUT = 20
 
+
 @IDF.idf_example_test(env_tag='Example_CAN')
 def test_can_self_test_example(env, extra_data):
     # Get device under test, flash and start example. "dut4" must be defined in EnvConfig
@@ -25,5 +28,6 @@ def test_can_self_test_example(env, extra_data):
     for string in STR_EXPECT:
         dut.expect(string, timeout=EXPECT_TIMEOUT)
 
+
 if __name__ == '__main__':
     test_can_self_test_example()

examples/peripherals/i2s_adc_dac/tools/generate_audio_file.py

@@ -4,6 +4,7 @@ import os
 import wave
 import struct
 
+
 def get_wave_array_str(filename, target_bits):
     wave_read = wave.open(filename, "r")
     array_str = ""
@@ -21,6 +22,7 @@ def get_wave_array_str(filename, target_bits):
             array_str += "\n"
     return array_str
 
+
 def gen_wave_table(wav_file_list, target_file_name, scale_bits=8):
     with open(target_file_name, "w") as audio_table:
         print('#include <stdio.h>', file=audio_table)
@@ -31,6 +33,7 @@ def gen_wave_table(wav_file_list, target_file_name, scale_bits = 8):
         print('};\n', file=audio_table)
     print("Done...")
 
+
 if __name__ == '__main__':
     print("Generating audio array...")
     wav_list = []

examples/peripherals/sdio/sdio_test.py

@@ -13,17 +13,19 @@
 # limitations under the License.
 
 """ example of writing test with TinyTestFW """
-import re
 import os
 import sys
 
+try:
+    import TinyFW
+except ImportError:
     # if we want to run test case outside `tiny-test-fw` folder,
     # we need to insert tiny-test-fw path into sys path
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
     import TinyFW
+
 import IDF
 
 

examples/protocols/asio/chat_client/asio_chat_client_test.py

@@ -1,10 +1,13 @@
 import re
 import os
 import sys
-from socket import *
+import socket
 from threading import Thread
 import time
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -12,28 +15,28 @@ import time
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
-global g_client_response;
+global g_client_response
-global g_msg_to_client;
+global g_msg_to_client
 
 g_client_response = b""
 g_msg_to_client = b"   3XYZ"
 
+
 def get_my_ip():
-    s1 = socket(AF_INET, SOCK_DGRAM)
+    s1 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     s1.connect(("8.8.8.8", 80))
     my_ip = s1.getsockname()[0]
     s1.close()
     return my_ip
 
+
 def chat_server_sketch(my_ip):
     global g_client_response
     print("Starting the server on {}".format(my_ip))
     port = 2222
-    s=socket(AF_INET, SOCK_STREAM)
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     s.settimeout(600)
     s.bind((my_ip, port))
     s.listen(1)
@@ -51,6 +54,7 @@ def chat_server_sketch(my_ip):
     s.close()
     print("server closed")
 
+
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_asio_chat_client(env, extra_data):
     """
@@ -77,7 +81,7 @@ def test_examples_protocol_asio_chat_client(env, extra_data):
     thread1.start()
     # 2. start the dut test and wait till client gets IP address
     dut1.start_app()
-    data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
+    dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     # 3. send host's IP to the client i.e. the `dut1`
     dut1.write(host_ip)
     # 4. client `dut1` should receive a message
@@ -97,5 +101,6 @@ def test_examples_protocol_asio_chat_client(env, extra_data):
         raise ValueError('Wrong data received from asi tcp server: {} (expected:{})'.format(g_client_response[4:7], test_msg))
     thread1.join()
 
+
 if __name__ == '__main__':
     test_examples_protocol_asio_chat_client()

examples/protocols/asio/chat_server/asio_chat_server_test.py

@@ -1,9 +1,12 @@
 import re
 import os
 import sys
-from socket import *
+import socket
 
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -11,13 +14,9 @@ from socket import *
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 
-
-
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_asio_chat_server(env, extra_data):
     """
@@ -39,7 +38,7 @@ def test_examples_protocol_asio_chat_server(env, extra_data):
     # 2. get the server IP address
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     # 3. create tcp client and connect to server
-    cli = socket(AF_INET,SOCK_STREAM)
+    cli = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     cli.settimeout(30)
     cli.connect((data[0],80))
     cli.send(test_msg)

examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py

@@ -1,9 +1,12 @@
 import re
 import os
 import sys
-from socket import *
+import socket
 
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -12,12 +15,9 @@ test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
 
-import TinyFW
     import IDF
 
 
-
-
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_asio_tcp_server(env, extra_data):
     """
@@ -40,7 +40,7 @@ def test_examples_protocol_asio_tcp_server(env, extra_data):
     # 2. get the server IP address
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     # 3. create tcp client and connect to server
-    cli = socket(AF_INET,SOCK_STREAM)
+    cli = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     cli.settimeout(30)
     cli.connect((data[0],80))
     cli.send(test_msg)

examples/protocols/asio/udp_echo_server/asio_udp_server_test.py

@@ -1,9 +1,12 @@
 import re
 import os
 import sys
-from socket import *
+import socket
 
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -12,12 +15,9 @@ test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
 
-import TinyFW
     import IDF
 
 
-
-
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_asio_udp_server(env, extra_data):
     """
@@ -40,7 +40,7 @@ def test_examples_protocol_asio_udp_server(env, extra_data):
     # 2. get the server IP address
     data = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     # 3. create tcp client and connect to server
-    cli = socket(AF_INET, SOCK_DGRAM)
+    cli = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     cli.settimeout(30)
     cli.connect((data[0], 80))
     cli.send(test_msg)
@@ -55,5 +55,6 @@ def test_examples_protocol_asio_udp_server(env, extra_data):
     # 5. check the client message appears also on server terminal
     dut1.expect(test_msg.decode())
 
+
 if __name__ == '__main__':
     test_examples_protocol_asio_udp_server()

examples/protocols/esp_http_client/esp_http_client_test.py

@@ -2,6 +2,9 @@ import re
 import os
 import sys
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -10,7 +13,6 @@ test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
 
-import TinyFW
     import IDF
 
 

examples/protocols/http_server/advanced_tests/http_server_advanced_test.py

@@ -21,28 +21,29 @@ import imp
 import re
 import os
 import sys
-import string
-import random
-import socket
 
+try:
+    import IDF
+except ImportError:
     # This environment variable is expected on the host machine
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
 
+    import IDF
+
+import Utility
+
 # When running on local machine execute the following before running this script
 # > make app bootloader
 # > make print_flash_cmd | tail -n 1 > build/download.config
 # > export TEST_FW_PATH=~/esp/esp-idf/tools/tiny-test-fw
 
-import TinyFW
-import IDF
-import Utility
-
 # Import client module
 expath = os.path.dirname(os.path.realpath(__file__))
 client = imp.load_source("client", expath + "/scripts/test.py")
 
+
 # Due to connectivity issues (between runner host and DUT) in the runner environment,
 # some of the `advanced_tests` are ignored. These tests are intended for verifying
 # the expected limits of the http_server capabilities, and implement sending and receiving
@@ -69,8 +70,10 @@ def test_examples_protocol_http_server_advanced(env, extra_data):
     got_ip = dut1.expect(re.compile(r"(?:[\s\S]*)Got IP: '(\d+.\d+.\d+.\d+)'"), timeout=30)[0]
 
     got_port = dut1.expect(re.compile(r"(?:[\s\S]*)Started HTTP server on port: '(\d+)'"), timeout=15)[0]
-    result = dut1.expect(re.compile(r"(?:[\s\S]*)Max URI handlers: '(\d+)'(?:[\s\S]*)Max Open Sessions: '(\d+)'(?:[\s\S]*)Max Header Length: '(\d+)'(?:[\s\S]*)Max URI Length: '(\d+)'(?:[\s\S]*)Max Stack Size: '(\d+)'"), timeout=15)
+    result = dut1.expect(re.compile(r"(?:[\s\S]*)Max URI handlers: '(\d+)'(?:[\s\S]*)Max Open Sessions: "  # noqa: W605
-    max_uri_handlers = int(result[0])
+                                    r"'(\d+)'(?:[\s\S]*)Max Header Length: '(\d+)'(?:[\s\S]*)Max URI Length: "
+                                    r"'(\d+)'(?:[\s\S]*)Max Stack Size: '(\d+)'"), timeout=15)
+    # max_uri_handlers = int(result[0])
     max_sessions = int(result[1])
     max_hdr_len = int(result[2])
     max_uri_len = int(result[3])
@@ -95,7 +98,7 @@ def test_examples_protocol_http_server_advanced(env, extra_data):
     if not client.recv_timeout_test(got_ip, got_port):
         failed = True
 
-    ## This test fails a lot! Enable when connection is stable
+    # This test fails a lot! Enable when connection is stable
     # test_size = 50*1024 # 50KB
     # if not client.packet_size_limit_test(got_ip, got_port, test_size):
     #    Utility.console_log("Ignoring failure")
@@ -165,5 +168,6 @@ def test_examples_protocol_http_server_advanced(env, extra_data):
     if failed:
         raise RuntimeError
 
+
 if __name__ == '__main__':
     test_examples_protocol_http_server_advanced()

examples/protocols/http_server/advanced_tests/scripts/test.py

@@ -131,8 +131,6 @@
 
 from __future__ import division
 from __future__ import print_function
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import range
 from builtins import object
@@ -148,6 +146,7 @@ import Utility
 
 _verbose_ = False
 
+
 class Session(object):
     def __init__(self, addr, port, timeout=15):
         self.client = socket.create_connection((addr, int(port)), timeout=timeout)
@@ -160,7 +159,7 @@ class Session(object):
     def send_err_check(self, request, data=None):
         rval = True
         try:
-            self.client.sendall(request.encode());
+            self.client.sendall(request.encode())
             if data:
                 self.client.sendall(data.encode())
         except socket.error as err:
@@ -284,6 +283,7 @@ class Session(object):
     def close(self):
         self.client.close()
 
+
 def test_val(text, expected, received):
     if expected != received:
         Utility.console_log(" Fail!")
@@ -293,6 +293,7 @@ def test_val(text, expected, received):
         return False
     return True
 
+
 class adder_thread (threading.Thread):
     def __init__(self, id, dut, port):
         threading.Thread.__init__(self)
@@ -329,6 +330,7 @@ class adder_thread (threading.Thread):
     def close(self):
         self.session.close()
 
+
 def get_hello(dut, port):
     # GET /hello should return 'Hello World!'
     Utility.console_log("[test] GET /hello returns 'Hello World!' =>", end=' ')
@@ -348,6 +350,7 @@ def get_hello(dut, port):
     conn.close()
     return True
 
+
 def put_hello(dut, port):
     # PUT /hello returns 405'
     Utility.console_log("[test] PUT /hello returns 405 =>", end=' ')
@@ -361,6 +364,7 @@ def put_hello(dut, port):
     conn.close()
     return True
 
+
 def post_hello(dut, port):
     # POST /hello returns 405'
     Utility.console_log("[test] POST /hello returns 404 =>", end=' ')
@@ -374,6 +378,7 @@ def post_hello(dut, port):
     conn.close()
     return True
 
+
 def post_echo(dut, port):
     # POST /echo echoes data'
     Utility.console_log("[test] POST /echo echoes data =>", end=' ')
@@ -390,6 +395,7 @@ def post_echo(dut, port):
     conn.close()
     return True
 
+
 def put_echo(dut, port):
     # PUT /echo echoes data'
     Utility.console_log("[test] PUT /echo echoes data =>", end=' ')
@@ -406,6 +412,7 @@ def put_echo(dut, port):
     conn.close()
     return True
 
+
 def get_echo(dut, port):
     # GET /echo returns 404'
     Utility.console_log("[test] GET /echo returns 405 =>", end=' ')
@@ -419,6 +426,7 @@ def get_echo(dut, port):
     conn.close()
     return True
 
+
 def get_hello_type(dut, port):
     # GET /hello/type_html returns text/html as Content-Type'
     Utility.console_log("[test] GET /hello/type_html has Content-Type of text/html =>", end=' ')
@@ -438,6 +446,7 @@ def get_hello_type(dut, port):
     conn.close()
     return True
 
+
 def get_hello_status(dut, port):
     # GET /hello/status_500 returns status 500'
     Utility.console_log("[test] GET /hello/status_500 returns status 500 =>", end=' ')
@@ -451,6 +460,7 @@ def get_hello_status(dut, port):
     conn.close()
     return True
 
+
 def get_false_uri(dut, port):
     # GET /false_uri returns status 404'
     Utility.console_log("[test] GET /false_uri returns status 404 =>", end=' ')
@@ -464,6 +474,7 @@ def get_false_uri(dut, port):
     conn.close()
     return True
 
+
 def parallel_sessions_adder(dut, port, max_sessions):
     # POSTs on /adder in parallel sessions
     Utility.console_log("[test] POST {pipelined} on /adder in " + str(max_sessions) + " sessions =>", end=' ')
@@ -487,6 +498,7 @@ def parallel_sessions_adder(dut, port, max_sessions):
         Utility.console_log("Success")
     return res
 
+
 def async_response_test(dut, port):
     # Test that an asynchronous work is executed in the HTTPD's context
     # This is tested by reading two responses over the same session
@@ -506,6 +518,7 @@ def async_response_test(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def leftover_data_test(dut, port):
     # Leftover data in POST is purged (valid and invalid URIs)
     Utility.console_log("[test] Leftover data in POST is purged (valid and invalid URIs) =>", end=' ')
@@ -540,6 +553,7 @@ def leftover_data_test(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def spillover_session(dut, port, max_sess):
     # Session max_sess_sessions + 1 is rejected
     Utility.console_log("[test] Session max_sess_sessions (" + str(max_sess) + ") + 1 is rejected =>", end=' ')
@@ -556,7 +570,7 @@ def spillover_session(dut, port, max_sess):
                 a.close()
                 break
             s.append(a)
-        except:
+        except Exception:
             if (_verbose_):
                 Utility.console_log("Connection " + str(i) + " rejected")
             a.close()
@@ -570,6 +584,7 @@ def spillover_session(dut, port, max_sess):
     Utility.console_log(["Fail","Success"][len(s) == max_sess])
     return (len(s) == max_sess)
 
+
 def recv_timeout_test(dut, port):
     Utility.console_log("[test] Timeout occurs if partial packet sent =>", end=' ')
     s = Session(dut, port)
@@ -583,6 +598,7 @@ def recv_timeout_test(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def packet_size_limit_test(dut, port, test_size):
     Utility.console_log("[test] send size limit test =>", end=' ')
     retry = 5
@@ -616,6 +632,7 @@ def packet_size_limit_test(dut, port, test_size):
     Utility.console_log("Failed")
     return False
 
+
 def code_500_server_error_test(dut, port):
     Utility.console_log("[test] 500 Server Error test =>", end=' ')
     s = Session(dut, port)
@@ -623,7 +640,7 @@ def code_500_server_error_test(dut, port):
     content_len = 2**31
     s.client.sendall(("POST /echo HTTP/1.1\r\nHost: " + dut + "\r\nContent-Length: " + str(content_len) + "\r\n\r\nABCD").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     if not test_val("Server Error", "500", s.status):
         s.close()
         return False
@@ -631,13 +648,14 @@ def code_500_server_error_test(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def code_501_method_not_impl(dut, port):
     Utility.console_log("[test] 501 Method Not Implemented =>", end=' ')
     s = Session(dut, port)
     path = "/hello"
     s.client.sendall(("ABC " + path + " HTTP/1.1\r\nHost: " + dut + "\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     # Presently server sends back 400 Bad Request
     # if not test_val("Server Error", "501", s.status):
     #     s.close()
@@ -649,13 +667,14 @@ def code_501_method_not_impl(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def code_505_version_not_supported(dut, port):
     Utility.console_log("[test] 505 Version Not Supported =>", end=' ')
     s = Session(dut, port)
     path = "/hello"
     s.client.sendall(("GET " + path + " HTTP/2.0\r\nHost: " + dut + "\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     if not test_val("Server Error", "505", s.status):
         s.close()
         return False
@@ -663,13 +682,14 @@ def code_505_version_not_supported(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def code_400_bad_request(dut, port):
     Utility.console_log("[test] 400 Bad Request =>", end=' ')
     s = Session(dut, port)
     path = "/hello"
     s.client.sendall(("XYZ " + path + " HTTP/1.1\r\nHost: " + dut + "\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     if not test_val("Client Error", "400", s.status):
         s.close()
         return False
@@ -677,13 +697,14 @@ def code_400_bad_request(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def code_404_not_found(dut, port):
     Utility.console_log("[test] 404 Not Found =>", end=' ')
     s = Session(dut, port)
     path = "/dummy"
     s.client.sendall(("GET " + path + " HTTP/1.1\r\nHost: " + dut + "\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     if not test_val("Client Error", "404", s.status):
         s.close()
         return False
@@ -691,13 +712,14 @@ def code_404_not_found(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def code_405_method_not_allowed(dut, port):
     Utility.console_log("[test] 405 Method Not Allowed =>", end=' ')
     s = Session(dut, port)
     path = "/hello"
     s.client.sendall(("POST " + path + " HTTP/1.1\r\nHost: " + dut + "\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     if not test_val("Client Error", "405", s.status):
         s.close()
         return False
@@ -705,12 +727,13 @@ def code_405_method_not_allowed(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def code_408_req_timeout(dut, port):
     Utility.console_log("[test] 408 Request Timeout =>", end=' ')
     s = Session(dut, port)
     s.client.sendall(("POST /echo HTTP/1.1\r\nHost: " + dut + "\r\nContent-Length: 10\r\n\r\nABCD").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     if not test_val("Client Error", "408", s.status):
         s.close()
         return False
@@ -718,13 +741,14 @@ def code_408_req_timeout(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def code_411_length_required(dut, port):
     Utility.console_log("[test] 411 Length Required =>", end=' ')
     s = Session(dut, port)
     path = "/echo"
     s.client.sendall(("POST " + path + " HTTP/1.1\r\nHost: " + dut + "\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     # Presently server sends back 400 Bad Request
     # if not test_val("Client Error", "411", s.status):
     #    s.close()
@@ -736,6 +760,7 @@ def code_411_length_required(dut, port):
     Utility.console_log("Success")
     return True
 
+
 def send_getx_uri_len(dut, port, length):
     s = Session(dut, port)
     method = "GET "
@@ -747,10 +772,11 @@ def send_getx_uri_len(dut, port, length):
     time.sleep(1)
     s.client.sendall((version + "Host: " + dut + "\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     s.close()
     return s.status
 
+
 def code_414_uri_too_long(dut, port, max_uri_len):
     Utility.console_log("[test] 414 URI Too Long =>", end=' ')
     status = send_getx_uri_len(dut, port, max_uri_len)
@@ -762,6 +788,7 @@ def code_414_uri_too_long(dut, port, max_uri_len):
     Utility.console_log("Success")
     return True
 
+
 def send_postx_hdr_len(dut, port, length):
     s = Session(dut, port)
     path = "/echo"
@@ -779,6 +806,7 @@ def send_postx_hdr_len(dut, port, length):
         return (hdr["Custom"] == custom_hdr_val), resp
     return False, s.status
 
+
 def code_431_hdr_too_long(dut, port, max_hdr_len):
     Utility.console_log("[test] 431 Header Too Long =>", end=' ')
     res, status = send_postx_hdr_len(dut, port, max_hdr_len)
@@ -790,13 +818,14 @@ def code_431_hdr_too_long(dut, port, max_hdr_len):
     Utility.console_log("Success")
     return True
 
+
 def test_upgrade_not_supported(dut, port):
     Utility.console_log("[test] Upgrade Not Supported =>", end=' ')
     s = Session(dut, port)
-    path = "/hello"
+    # path = "/hello"
     s.client.sendall(("OPTIONS * HTTP/1.1\r\nHost:" + dut + "\r\nUpgrade: TLS/1.0\r\nConnection: Upgrade\r\n\r\n").encode())
     s.read_resp_hdrs()
-    resp = s.read_resp_data()
+    s.read_resp_data()
     if not test_val("Client Error", "200", s.status):
         s.close()
         return False
@@ -804,8 +833,9 @@ def test_upgrade_not_supported(dut, port):
     Utility.console_log("Success")
     return True
 
+
 if __name__ == '__main__':
-    ########### Execution begins here...
+    # Execution begins here...
     # Configuration
     # Max number of threads/sessions
     max_sessions = 7
@@ -849,7 +879,7 @@ if __name__ == '__main__':
     test_upgrade_not_supported(dut, port)
 
     # Not supported yet (Error on chunked request)
-    ###code_411_length_required(dut, port)
+    # code_411_length_required(dut, port)
 
     Utility.console_log("### Sessions and Context Tests")
     parallel_sessions_adder(dut, port, max_sessions)

examples/protocols/http_server/persistent_sockets/http_server_persistence_test.py

@@ -23,28 +23,29 @@ import imp
 import re
 import os
 import sys
-import string
 import random
-import socket
 
+try:
+    import IDF
+except ImportError:
     # This environment variable is expected on the host machine
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
+    import IDF
+
+import Utility
 
 # When running on local machine execute the following before running this script
 # > make app bootloader
 # > make print_flash_cmd | tail -n 1 > build/download.config
 # > export TEST_FW_PATH=~/esp/esp-idf/tools/tiny-test-fw
 
-import TinyFW
-import IDF
-import Utility
-
 # Import client module
 expath = os.path.dirname(os.path.realpath(__file__))
 client = imp.load_source("client", expath + "/scripts/adder.py")
 
+
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_http_server_persistence(env, extra_data):
     # Acquire DUT
@@ -97,7 +98,7 @@ def test_examples_protocol_http_server_persistence(env, extra_data):
         dut1.expect("PUT allocating new session", timeout=30)
         # Not expected
         raise RuntimeError
-    except:
+    except Exception:
         # As expected
         pass
 
@@ -126,7 +127,7 @@ def test_examples_protocol_http_server_persistence(env, extra_data):
 
     Utility.console_log("Validating user context data")
     # Start another session to check user context data
-    conn2 = client.start_session(got_ip, got_port)
+    client.start_session(got_ip, got_port)
     num = random.randint(0,100)
     client.putreq(conn, "/adder", str(num))
     visitor += 1
@@ -136,5 +137,6 @@ def test_examples_protocol_http_server_persistence(env, extra_data):
     client.end_session(conn)
     dut1.expect("/adder Free Context function called", timeout=30)
 
+
 if __name__ == '__main__':
     test_examples_protocol_http_server_persistence()

examples/protocols/http_server/persistent_sockets/scripts/adder.py

@@ -16,19 +16,21 @@
 
 from __future__ import print_function
 from __future__ import unicode_literals
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import range
 import http.client
 import argparse
+import Utility
+
 
 def start_session(ip, port):
     return http.client.HTTPConnection(ip, int(port), timeout=15)
 
+
 def end_session(conn):
     conn.close()
 
+
 def getreq(conn, path, verbose=False):
     conn.request("GET", path)
     resp = conn.getresponse()
@@ -41,6 +43,7 @@ def getreq (conn, path, verbose = False):
         Utility.console_log("Data content : " + data)
     return data
 
+
 def postreq(conn, path, data, verbose=False):
     conn.request("POST", path, data)
     resp = conn.getresponse()
@@ -53,6 +56,7 @@ def postreq (conn, path, data, verbose = False):
         Utility.console_log("Data content : " + data)
     return data
 
+
 def putreq(conn, path, body, verbose=False):
     conn.request("PUT", path, body)
     resp = conn.getresponse()
@@ -65,6 +69,7 @@ def putreq (conn, path, body, verbose = False):
         Utility.console_log("Data content : " + data)
     return data
 
+
 if __name__ == '__main__':
     # Configure argument parser
     parser = argparse.ArgumentParser(description='Run HTTPd Test')

examples/protocols/http_server/simple/http_server_simple_test.py

@@ -24,26 +24,29 @@ import os
 import sys
 import string
 import random
-import socket
 
+try:
+    import IDF
+except ImportError:
     # This environment variable is expected on the host machine
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
 
+    import IDF
+
+import Utility
+
 # When running on local machine execute the following before running this script
 # > make app bootloader
 # > make print_flash_cmd | tail -n 1 > build/download.config
 # > export TEST_FW_PATH=~/esp/esp-idf/tools/tiny-test-fw
 
-import TinyFW
-import IDF
-import Utility
-
 # Import client module
 expath = os.path.dirname(os.path.realpath(__file__))
 client = imp.load_source("client", expath + "/scripts/client.py")
 
+
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_http_server_simple(env, extra_data):
     # Acquire DUT
@@ -77,7 +80,7 @@ def test_examples_protocol_http_server_simple(env, extra_data):
         raise RuntimeError
 
     # Acquire host IP. Need a way to check it
-    host_ip = dut1.expect(re.compile(r"(?:[\s\S]*)Found header => Host: (\d+.\d+.\d+.\d+)"), timeout=30)[0]
+    dut1.expect(re.compile(r"(?:[\s\S]*)Found header => Host: (\d+.\d+.\d+.\d+)"), timeout=30)[0]
 
     # Match additional headers sent in the request
     dut1.expect("Found header => Test-Header-2: Test-Value-2", timeout=30)
@@ -117,5 +120,6 @@ def test_examples_protocol_http_server_simple(env, extra_data):
         raise RuntimeError
     dut1.expect("400 Bad Request - Server unable to understand request due to invalid syntax", timeout=30)
 
+
 if __name__ == '__main__':
     test_examples_protocol_http_server_simple()

examples/protocols/http_server/simple/scripts/client.py

@@ -16,16 +16,17 @@
 
 from __future__ import print_function
 from __future__ import unicode_literals
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 import http.client
 import argparse
+import Utility
+
 
 def verbose_print(verbosity, *args):
     if (verbosity):
         Utility.console_log(''.join(str(elems) for elems in args))
 
+
 def test_get_handler(ip, port, verbosity=False):
     verbose_print(verbosity, "========  GET HANDLER TEST =============")
     # Establish HTTP connection
@@ -48,7 +49,7 @@ def test_get_handler(ip, port, verbosity = False):
             return False
         if resp.getheader("Custom-Header-2") != "Custom-Value-2":
             return False
-    except:
+    except Exception:
         return False
 
     verbose_print(verbosity, "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv")
@@ -63,6 +64,7 @@ def test_get_handler(ip, port, verbosity = False):
     sess.close()
     return (resp_data == "Hello World!")
 
+
 def test_post_handler(ip, port, msg, verbosity=False):
     verbose_print(verbosity, "========  POST HANDLER TEST ============")
     # Establish HTTP connection
@@ -82,6 +84,7 @@ def test_post_handler(ip, port, msg, verbosity = False):
     sess.close()
     return (resp_data == msg)
 
+
 def test_put_handler(ip, port, verbosity=False):
     verbose_print(verbosity, "========  PUT HANDLER TEST =============")
     # Establish HTTP connection
@@ -114,6 +117,7 @@ def test_put_handler(ip, port, verbosity = False):
     sess.close()
     return ((resp_data2 == "Hello World!") and (resp_data1 == "This URI doesn't exist"))
 
+
 def test_custom_uri_query(ip, port, query, verbosity=False):
     verbose_print(verbosity, "========  GET HANDLER TEST =============")
     # Establish HTTP connection
@@ -136,6 +140,7 @@ def test_custom_uri_query(ip, port, query, verbosity = False):
     sess.close()
     return (resp_data == "Hello World!")
 
+
 if __name__ == '__main__':
     # Configure argument parser
     parser = argparse.ArgumentParser(description='Run HTTPd Test')

examples/protocols/https_request/example_test.py

@@ -2,6 +2,9 @@ import re
 import os
 import sys
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -9,8 +12,6 @@ import sys
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 

examples/protocols/mdns/mdns_example_test.py

@@ -3,28 +3,31 @@ import os
 import sys
 import socket
 import time
-import imp
 import struct
-import dpkt, dpkt.dns
+import dpkt
+import dpkt.dns
 from threading import Thread
 
 
-
 # this is a test case write with tiny-test-fw.
 # to run test cases outside tiny-test-fw,
 # we need to set environment variable `TEST_FW_PATH`,
 # then get and insert `TEST_FW_PATH` to sys path before import FW module
 
+try:
+    import IDF
+except ImportError:
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
+import DUT
+
 g_run_server = True
 g_done = False
 
+
 def mdns_server(esp_host):
     global g_run_server
     global g_done
@@ -52,7 +55,7 @@ def mdns_server(esp_host):
     sock.sendto(resp_dns.pack(),(MCAST_GRP,UDP_PORT))
     while g_run_server:
         try:
-            m=sock.recvfrom( 1024 );
+            m = sock.recvfrom(1024)
             dns = dpkt.dns.DNS(m[0])
             if len(dns.qd) > 0 and dns.qd[0].type == dpkt.dns.DNS_A:
                 if dns.qd[0].name == u'tinytester.local':
@@ -71,6 +74,7 @@ def mdns_server(esp_host):
         except socket.timeout:
             break
 
+
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_mdns(env, extra_data):
     global g_run_server
@@ -93,9 +97,8 @@ def test_examples_protocol_mdns(env, extra_data):
     # 2. get the dut host name (and IP address)
     specific_host = dut1.expect(re.compile(r"mdns hostname set to: \[([^\]]+)\]"), timeout=30)
     specific_host = str(specific_host[0])
-    dut_ip = ""
     try:
-        dut_ip = dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
+        dut1.expect(re.compile(r" sta ip: ([^,]+),"), timeout=30)
     except DUT.ExpectTimeout:
         raise ValueError('ENV_TEST_FAILURE: Cannot connect to AP')
     # 3. check the mdns name is accessible
@@ -108,10 +111,11 @@ def test_examples_protocol_mdns(env, extra_data):
             break
     g_run_server = False
     thread1.join()
-    if g_done == False:
+    if g_done is False:
         raise ValueError('Test has failed: did not receive mdns answer within timeout')
     # 4. check DUT output if mdns advertized host is resolved
     dut1.expect(re.compile(r"mdns-test: Query A: tinytester.local resolved to: 127.0.0.1"), timeout=30)
 
+
 if __name__ == '__main__':
     test_examples_protocol_mdns()

examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py

@@ -2,15 +2,28 @@ import re
 import os
 import sys
 import time
-import socket
-import imp
 import ssl
 import paho.mqtt.client as mqtt
 
+try:
+    import IDF
+except ImportError:
+    # this is a test case write with tiny-test-fw.
+    # to run test cases outside tiny-test-fw,
+    # we need to set environment variable `TEST_FW_PATH`,
+    # then get and insert `TEST_FW_PATH` to sys path before import FW module
+    test_fw_path = os.getenv("TEST_FW_PATH")
+    if test_fw_path and test_fw_path not in sys.path:
+        sys.path.insert(0, test_fw_path)
+    import IDF
+
+import DUT
+
 g_recv_data = ""
 g_recv_topic = ""
 g_broker_connected = 0
 
+
 # The callback for when the client receives a CONNACK response from the server.
 def on_connect(client, userdata, flags, rc):
     global g_broker_connected
@@ -18,6 +31,7 @@ def on_connect(client, userdata, flags, rc):
     g_broker_connected = 1
     client.subscribe("/topic/qos0")
 
+
 # The callback for when a PUBLISH message is received from the server.
 def on_message(client, userdata, msg):
     global g_recv_topic
@@ -29,19 +43,6 @@ def on_message(client, userdata, msg):
         g_recv_data = payload
     print(msg.topic + " " + str(payload))
 
-# this is a test case write with tiny-test-fw.
-# to run test cases outside tiny-test-fw,
-# we need to set environment variable `TEST_FW_PATH`,
-# then get and insert `TEST_FW_PATH` to sys path before import FW module
-test_fw_path = os.getenv("TEST_FW_PATH")
-if test_fw_path and test_fw_path not in sys.path:
-    sys.path.insert(0, test_fw_path)
-
-import TinyFW
-import IDF
-import DUT
-
-
 
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_mqtt_ssl(env, extra_data):
@@ -81,7 +82,7 @@ def test_examples_protocol_mqtt_ssl(env, extra_data):
         print("...done")
     except DUT.ExpectTimeout:
         raise ValueError('ENV_TEST_FAILURE: Cannot connect to AP')
-    except:
+    except Exception:
         print("ENV_TEST_FAILURE: Unexpected error while connecting to broker {}: {}:".format(broker_url, sys.exc_info()[0]))
         raise
     print("Start Looping...")
@@ -100,5 +101,6 @@ def test_examples_protocol_mqtt_ssl(env, extra_data):
     # 4. check that the esp32 client received data sent by this python client
     dut1.expect(re.compile(r"DATA=data_to_esp32"), timeout=30)
 
+
 if __name__ == '__main__':
     test_examples_protocol_mqtt_ssl()

examples/protocols/mqtt/tcp/mqtt_tcp_example_test.py

@@ -1,33 +1,50 @@
 import re
 import os
 import sys
-from socket import *
+import socket
 from threading import Thread
 import struct
 import time
 
+
+try:
+    import IDF
+except ImportError:
+    # this is a test case write with tiny-test-fw.
+    # to run test cases outside tiny-test-fw,
+    # we need to set environment variable `TEST_FW_PATH`,
+    # then get and insert `TEST_FW_PATH` to sys path before import FW module
+    test_fw_path = os.getenv("TEST_FW_PATH")
+    if test_fw_path and test_fw_path not in sys.path:
+        sys.path.insert(0, test_fw_path)
+    import IDF
+
+import DUT
+
 msgid = -1
 
+
 def get_my_ip():
-    s1 = socket(AF_INET, SOCK_DGRAM)
+    s1 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     s1.connect(("8.8.8.8", 80))
     my_ip = s1.getsockname()[0]
     s1.close()
     return my_ip
 
+
 def mqqt_server_sketch(my_ip, port):
     global msgid
     print("Starting the server on {}".format(my_ip))
     s = None
     try:
-        s=socket(AF_INET, SOCK_STREAM)
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         s.settimeout(60)
         s.bind((my_ip, port))
         s.listen(1)
         q,addr = s.accept()
         q.settimeout(30)
         print("connection accepted")
-    except:
+    except Exception:
         print("Local server on {}:{} listening/accepting failure: {}"
               "Possibly check permissions or firewall settings"
               "to accept connections on this address".format(my_ip, port, sys.exc_info()[0]))
@@ -47,20 +64,6 @@ def mqqt_server_sketch(my_ip, port):
     s.close()
     print("server closed")
 
-# this is a test case write with tiny-test-fw.
-# to run test cases outside tiny-test-fw,
-# we need to set environment variable `TEST_FW_PATH`,
-# then get and insert `TEST_FW_PATH` to sys path before import FW module
-test_fw_path = os.getenv("TEST_FW_PATH")
-if test_fw_path and test_fw_path not in sys.path:
-    sys.path.insert(0, test_fw_path)
-
-import TinyFW
-import IDF
-import DUT
-
-
-
 
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_mqtt_qos1(env, extra_data):
@@ -105,5 +108,6 @@ def test_examples_protocol_mqtt_qos1(env, extra_data):
         print("Failure!")
         raise ValueError('Mismatch of msgid: received: {}, enqueued {}, deleted {}'.format(msgid, msgid_enqueued, msgid_deleted))
 
+
 if __name__ == '__main__':
     test_examples_protocol_mqtt_qos1()

examples/protocols/mqtt/ws/mqtt_ws_example_test.py

@@ -5,14 +5,28 @@ import re
 import os
 import sys
 import time
-import socket
-import imp
 import paho.mqtt.client as mqtt
 
+try:
+    import IDF
+except Exception:
+    # this is a test case write with tiny-test-fw.
+    # to run test cases outside tiny-test-fw,
+    # we need to set environment variable `TEST_FW_PATH`,
+    # then get and insert `TEST_FW_PATH` to sys path before import FW module
+    test_fw_path = os.getenv("TEST_FW_PATH")
+    if test_fw_path and test_fw_path not in sys.path:
+        sys.path.insert(0, test_fw_path)
+    import IDF
+
+import DUT
+
+
 g_recv_data = ""
 g_recv_topic = ""
 g_broker_connected = 0
 
+
 # The callback for when the client receives a CONNACK response from the server.
 def on_connect(client, userdata, flags, rc):
     global g_broker_connected
@@ -20,6 +34,7 @@ def on_connect(client, userdata, flags, rc):
     g_broker_connected = 1
     client.subscribe("/topic/qos0")
 
+
 # The callback for when a PUBLISH message is received from the server.
 def on_message(client, userdata, msg):
     global g_recv_topic
@@ -31,18 +46,6 @@ def on_message(client, userdata, msg):
         g_recv_data = payload
     print(msg.topic + " " + payload)
 
-# this is a test case write with tiny-test-fw.
-# to run test cases outside tiny-test-fw,
-# we need to set environment variable `TEST_FW_PATH`,
-# then get and insert `TEST_FW_PATH` to sys path before import FW module
-test_fw_path = os.getenv("TEST_FW_PATH")
-if test_fw_path and test_fw_path not in sys.path:
-    sys.path.insert(0, test_fw_path)
-
-import TinyFW
-import IDF
-import DUT
-
 
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_mqtt_ws(env, extra_data):
@@ -79,7 +82,7 @@ def test_examples_protocol_mqtt_ws(env, extra_data):
         print("...done")
     except DUT.ExpectTimeout:
         raise ValueError('ENV_TEST_FAILURE: Cannot connect to AP')
-    except:
+    except Exception:
         print("ENV_TEST_FAILURE: Unexpected error while connecting to broker {}: {}:".format(broker_url, sys.exc_info()[0]))
         raise
     print("Start Looping...")
@@ -98,5 +101,6 @@ def test_examples_protocol_mqtt_ws(env, extra_data):
     # 4. check that the esp32 client received data sent by this python client
     dut1.expect(re.compile(r"DATA=data_to_esp32"), timeout=30)
 
+
 if __name__ == '__main__':
     test_examples_protocol_mqtt_ws()

examples/protocols/mqtt/wss/mqtt_wss_example_test.py

@@ -3,15 +3,28 @@ import re
 import os
 import sys
 import time
-import socket
-import imp
 import ssl
 import paho.mqtt.client as mqtt
 
+try:
+    import IDF
+except ImportError:
+    # this is a test case write with tiny-test-fw.
+    # to run test cases outside tiny-test-fw,
+    # we need to set environment variable `TEST_FW_PATH`,
+    # then get and insert `TEST_FW_PATH` to sys path before import FW module
+    test_fw_path = os.getenv("TEST_FW_PATH")
+    if test_fw_path and test_fw_path not in sys.path:
+        sys.path.insert(0, test_fw_path)
+    import IDF
+
+import DUT
+
 g_recv_data = ""
 g_recv_topic = ""
 g_broker_connected = 0
 
+
 # The callback for when the client receives a CONNACK response from the server.
 def on_connect(client, userdata, flags, rc):
     global g_broker_connected
@@ -19,6 +32,7 @@ def on_connect(client, userdata, flags, rc):
     g_broker_connected = 1
     client.subscribe("/topic/qos0")
 
+
 # The callback for when a PUBLISH message is received from the server.
 def on_message(client, userdata, msg):
     global g_recv_topic
@@ -30,19 +44,6 @@ def on_message(client, userdata, msg):
         g_recv_data = payload
     print(msg.topic + " " + str(payload))
 
-# this is a test case write with tiny-test-fw.
-# to run test cases outside tiny-test-fw,
-# we need to set environment variable `TEST_FW_PATH`,
-# then get and insert `TEST_FW_PATH` to sys path before import FW module
-test_fw_path = os.getenv("TEST_FW_PATH")
-if test_fw_path and test_fw_path not in sys.path:
-    sys.path.insert(0, test_fw_path)
-
-import TinyFW
-import IDF
-import DUT
-
-
 
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_mqtt_wss(env, extra_data):
@@ -81,7 +82,7 @@ def test_examples_protocol_mqtt_wss(env, extra_data):
         print("...done")
     except DUT.ExpectTimeout:
         raise ValueError('ENV_TEST_FAILURE: Cannot connect to AP')
-    except:
+    except Exception:
         print("ENV_TEST_FAILURE: Unexpected error while connecting to broker {}: {}:".format(broker_url, sys.exc_info()[0]))
         raise
     print("Start Looping...")
@@ -100,5 +101,6 @@ def test_examples_protocol_mqtt_wss(env, extra_data):
     # 4. check that the esp32 client received data sent by this python client
     dut1.expect(re.compile(r"DATA=data_to_esp32"), timeout=30)
 
+
 if __name__ == '__main__':
     test_examples_protocol_mqtt_wss()

examples/protocols/sockets/scripts/tcpclient.py

@@ -11,7 +11,7 @@ import socket
 import sys
 
 # -----------  Config  ----------
-PORT = 3333;
+PORT = 3333
 IP_VERSION = 'IPv4'
 IPV4 = '192.168.0.167'
 IPV6 = 'FE80::32AE:A4FF:FE80:5288'
@@ -31,14 +31,14 @@ try:
     sock = socket.socket(family_addr, socket.SOCK_STREAM)
 except socket.error as msg:
         print('Could not create socket: ' + str(msg[0]) + ': ' + msg[1])
-        sys.exit(1);
+        sys.exit(1)
 
 try:
     sock.connect((host, PORT))
 except socket.error as msg:
         print('Could not open socket: ', msg)
         sock.close()
-        sys.exit(1);
+        sys.exit(1)
 
 while True:
     msg = input('Enter message to send: ')
@@ -46,6 +46,7 @@ while True:
     msg = msg.encode()
     sock.sendall(msg)
     data = sock.recv(1024)
-    if not data: break; 
+    if not data:
+        break
     print('Reply: ' + data.decode())
 sock.close()

examples/protocols/sockets/scripts/tcpserver.py

@@ -11,7 +11,7 @@ import sys
 
 # -----------  Config  ----------
 IP_VERSION = 'IPv4'
-PORT = 3333;
+PORT = 3333
 # -------------------------------
 
 if IP_VERSION == 'IPv4':
@@ -45,7 +45,8 @@ except socket.error as msg:
 
 while True:
     data = conn.recv(128)
-    if not data: break
+    if not data:
+        break
     data = data.decode()
     print('Received data: ' + data)
     reply = 'OK: ' + data

examples/protocols/sockets/scripts/udpclient.py

@@ -30,7 +30,7 @@ else:
 
 try:
     sock = socket.socket(family_addr, socket.SOCK_DGRAM)
-except socket.error as msg:
+except socket.error:
     print('Failed to create socket')
     sys.exit()
 
@@ -39,7 +39,8 @@ while True:
     try:
         sock.sendto(msg.encode(), (host, PORT))
         reply, addr = sock.recvfrom(128)
-        if not reply: break
+        if not reply:
+            break
         print('Reply[' + addr[0] + ':' + str(addr[1]) + '] - ' + str(reply))
     except socket.error as msg:
         print('Error Code : ' + str(msg[0]) + ' Message: ' + msg[1])

examples/protocols/sockets/scripts/udpserver.py

@@ -11,7 +11,7 @@ import sys
 
 # -----------  Config  ----------
 IP_VERSION = 'IPv4'
-PORT = 3333;
+PORT = 3333
 # -------------------------------
 
 if IP_VERSION == 'IPv4':
@@ -40,7 +40,8 @@ while True:
     try:
         print('Waiting for data...')
         data, addr = sock.recvfrom(1024)
-        if not data: break
+        if not data:
+            break
         data = data.decode()
         print('Reply[' + addr[0] + ':' + str(addr[1]) + '] - ' + data)
         reply = 'OK ' + data

examples/storage/parttool/example_test.py

@@ -3,11 +3,12 @@ import os
 import sys
 import subprocess
 
+try:
+    import IDF
+except ImportError:
     test_fw_path = os.getenv('TEST_FW_PATH')
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 

examples/system/cpp_exceptions/example_test.py

@@ -2,13 +2,15 @@ from __future__ import print_function
 import os
 import sys
 
+try:
+    import IDF
+except ImportError:
     test_fw_path = os.getenv('TEST_FW_PATH')
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
+
 @IDF.idf_example_test(env_tag='Example_WIFI')
 def test_examples_system_cpp_exceptions(env, extra_data):
     dut = env.get_dut('cpp_exceptions_example', 'examples/system/cpp_exceptions')
@@ -24,5 +26,6 @@ def test_examples_system_cpp_exceptions(env, extra_data):
     for line in lines:
         dut.expect(line, timeout=2)
 
+
 if __name__ == '__main__':
     test_examples_system_cpp_exceptions()

examples/system/esp_event/default_event_loop/example_test.py

@@ -1,8 +1,10 @@
 from __future__ import print_function
-import re
 import os
 import sys
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -10,8 +12,6 @@ import sys
     test_fw_path = os.getenv('TEST_FW_PATH')
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 # Timer events
@@ -26,6 +26,7 @@ TASK_UNREGISTRATION_LIMIT = 3
 TASK_ITERATION_POST = "TASK_EVENTS:TASK_ITERATION_EVENT: posting to default loop, {} out of " + str(TASK_ITERATION_LIMIT)
 TASK_ITERATION_HANDLING = "TASK_EVENTS:TASK_ITERATION_EVENT: task_iteration_handler, executed {} times"
 
+
 def _test_timer_events(dut):
     dut.start_app()
 
@@ -64,6 +65,7 @@ def _test_timer_events(dut):
     dut.expect("TIMER_EVENTS:TIMER_EVENT_STOPPED: deleted timer event source")
     print("Handled timer stopped event")
 
+
 def _test_iteration_events(dut):
     dut.start_app()
 
@@ -89,6 +91,7 @@ def _test_iteration_events(dut):
     dut.expect("TASK_EVENTS:TASK_ITERATION_EVENT: deleting task event source")
     print("Deleted task event source")
 
+
 @IDF.idf_example_test(env_tag='Example_WIFI')
 def test_default_event_loop_example(env, extra_data):
     dut = env.get_dut('default_event_loop', 'examples/system/event/default_event_loop')
@@ -96,5 +99,6 @@ def test_default_event_loop_example(env, extra_data):
     _test_iteration_events(dut)
     _test_timer_events(dut)
 
+
 if __name__ == '__main__':
     test_default_event_loop_example()

examples/system/esp_event/user_event_loops/example_test.py

@@ -1,8 +1,10 @@
 from __future__ import print_function
-import re
 import os
 import sys
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -10,8 +12,6 @@ import sys
     test_fw_path = os.getenv('TEST_FW_PATH')
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 TASK_ITERATION_LIMIT = 10
@@ -19,6 +19,7 @@ TASK_ITERATION_LIMIT = 10
 TASK_ITERATION_POSTING = "posting TASK_EVENTS:TASK_ITERATION_EVENT to {}, iteration {} out of " + str(TASK_ITERATION_LIMIT)
 TASK_ITERATION_HANDLING = "handling TASK_EVENTS:TASK_ITERATION_EVENT from {}, iteration {}"
 
+
 @IDF.idf_example_test(env_tag='Example_WIFI')
 def test_user_event_loops_example(env, extra_data):
     dut = env.get_dut('user_event_loops', 'examples/system/event/user_event_loops')
@@ -46,5 +47,6 @@ def test_user_event_loops_example(env, extra_data):
     dut.expect("deleting task event source")
     print("Deleted task event source")
 
+
 if __name__ == '__main__':
     test_user_event_loops_example()

examples/system/esp_timer/example_test.py

@@ -3,6 +3,9 @@ import re
 import os
 import sys
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -10,8 +13,6 @@ import sys
     test_fw_path = os.getenv('TEST_FW_PATH')
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 STARTING_TIMERS_REGEX = re.compile(r'Started timers, time since boot: (\d+) us')
@@ -35,6 +36,7 @@ FINAL_TIMER_PERIOD = 1000000
 LIGHT_SLEEP_TIME = 500000
 ONE_SHOT_TIMER_PERIOD = 5000000
 
+
 @IDF.idf_example_test(env_tag='Example_WIFI')
 def test_examples_system_esp_timer(env, extra_data):
     dut = env.get_dut('esp_timer_example', 'examples/system/esp_timer')
@@ -93,5 +95,6 @@ def test_examples_system_esp_timer(env, extra_data):
 
     dut.expect(STOP_REGEX, timeout=2)
 
+
 if __name__ == '__main__':
     test_examples_system_esp_timer()

examples/system/light_sleep/example_test.py

@@ -4,11 +4,12 @@ import os
 import sys
 import time
 
+try:
+    import IDF
+except ImportError:
     test_fw_path = os.getenv('TEST_FW_PATH')
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 ENTERING_SLEEP_STR = 'Entering light sleep'
@@ -17,6 +18,7 @@ WAITING_FOR_GPIO_STR = 'Waiting for GPIO0 to go high...'
 
 WAKEUP_INTERVAL_MS = 2000
 
+
 @IDF.idf_example_test(env_tag='Example_WIFI')
 def test_examples_system_light_sleep(env, extra_data):
     dut = env.get_dut('light_sleep_example', 'examples/system/light_sleep')
@@ -58,5 +60,6 @@ def test_examples_system_light_sleep(env, extra_data):
     assert(groups[0] == 'timer' and int(groups[2]) == WAKEUP_INTERVAL_MS)
     print('Woke up from timer again')
 
+
 if __name__ == '__main__':
     test_examples_system_light_sleep()

examples/system/ota/otatool/example_test.py

@@ -3,6 +3,9 @@ import os
 import sys
 import subprocess
 
+try:
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -10,8 +13,6 @@ import subprocess
     test_fw_path = os.getenv('TEST_FW_PATH')
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
-import TinyFW
     import IDF
 
 

examples/wifi/iperf/iperf_test.py

@@ -30,8 +30,9 @@ import sys
 import time
 import subprocess
 
-# add current folder to system path for importing test_report
+try:
-sys.path.append(os.path.dirname(__file__))
+    import IDF
+except ImportError:
     # this is a test case write with tiny-test-fw.
     # to run test cases outside tiny-test-fw,
     # we need to set environment variable `TEST_FW_PATH`,
@@ -39,11 +40,17 @@ sys.path.append(os.path.dirname(__file__))
     test_fw_path = os.getenv("TEST_FW_PATH")
     if test_fw_path and test_fw_path not in sys.path:
         sys.path.insert(0, test_fw_path)
-
     import IDF
+
 import DUT
 import Utility
 from Utility import (Attenuator, PowerControl, LineChart)
+
+try:
+    from test_report import (ThroughputForConfigsReport, ThroughputVsRssiReport)
+except ImportError:
+    # add current folder to system path for importing test_report
+    sys.path.append(os.path.dirname(__file__))
     from test_report import (ThroughputForConfigsReport, ThroughputVsRssiReport)
 
 # configurations