esp_prov : Added config option for enabling exception throw from within APIs

Example tests updated to enable exception throwing feature of esp_prov

diff --git a/examples/provisioning/ble_prov/ble_prov_test.py b/examples/provisioning/ble_prov/ble_prov_test.py
index 55da793e37cc9dfcab97ebbbde8276de67e23b09..367dcc5553c4011e3efca9a9bef13282379f4143 100644 (file)
--- a/examples/provisioning/ble_prov/ble_prov_test.py
+++ b/examples/provisioning/ble_prov/ble_prov_test.py
@@ -38,6 +38,9 @@ import IDF
 idf_path = os.environ['IDF_PATH']
 esp_prov = imp.load_source("esp_prov", idf_path + "/tools/esp_prov/esp_prov.py")
 
+# Have esp_prov throw exception
+esp_prov.config_throw_except = True
+
 @IDF.idf_example_test(env_tag="Example_WIFI_BT")
 def test_examples_provisioning_ble(env, extra_data):
     # Acquire DUT

diff --git a/examples/provisioning/softap_prov/softap_prov_test.py b/examples/provisioning/softap_prov/softap_prov_test.py
index 2abd9e7c7c0ba9827df4027c0c333c8a550dc448..e79bbeae4add33acdd4b2f8b142b65125c850e34 100644 (file)
--- a/examples/provisioning/softap_prov/softap_prov_test.py
+++ b/examples/provisioning/softap_prov/softap_prov_test.py
@@ -39,6 +39,9 @@ idf_path = os.environ['IDF_PATH']
 esp_prov   = imp.load_source("esp_prov",   idf_path + "/tools/esp_prov/esp_prov.py")
 wifi_tools = imp.load_source("wifi_tools", idf_path + "/examples/provisioning/softap_prov/utils/wifi_tools.py")
 
+# Have esp_prov throw exception
+esp_prov.config_throw_except = True
+
 @IDF.idf_example_test(env_tag="Example_WIFI_BT")
 def test_examples_provisioning_softap(env, extra_data):
     # Acquire DUT

diff --git a/tools/esp_prov/esp_prov.py b/tools/esp_prov/esp_prov.py
index 10ad6713405a69e9f9bbd34b433d500f8327e505..4d7c0fee9dd62a835b58437c1c1c49136a855ba0 100644 (file)
--- a/tools/esp_prov/esp_prov.py
+++ b/tools/esp_prov/esp_prov.py
@@ -29,6 +29,15 @@ import security
 import transport
 import prov
 
+# Set this to true to allow exceptions to be thrown
+config_throw_except = False
+
+def on_except(err):
+    if config_throw_except:
+        raise RuntimeError(err)
+    else:
+        print(err)
+
 def get_security(secver, pop=None, verbose=False):
     if secver == 1:
         return security.Security1(pop, verbose)
@@ -53,7 +62,7 @@ def get_transport(sel_transport, softap_endpoint=None, ble_devname=None):
             tp = transport.Transport_Console()
         return tp
     except RuntimeError as e:
-        print(e)
+        on_except(e)
         return None
 
 def version_match(tp, protover):
@@ -63,7 +72,7 @@ def version_match(tp, protover):
             return False
         return True
     except RuntimeError as e:
-        print(e)
+        on_except(e)
         return None
 
 def establish_session(tp, sec):
@@ -78,7 +87,7 @@ def establish_session(tp, sec):
                 return False
         return True
     except RuntimeError as e:
-        print(e)
+        on_except(e)
         return None
 
 def custom_config(tp, sec, custom_info, custom_ver):
@@ -87,7 +96,7 @@ def custom_config(tp, sec, custom_info, custom_ver):
         response = tp.send_data('custom-config', message)
         return (prov.custom_config_response(sec, response) == 0)
     except RuntimeError as e:
-        print(e)
+        on_except(e)
         return None
 
 def send_wifi_config(tp, sec, ssid, passphrase):
@@ -96,7 +105,7 @@ def send_wifi_config(tp, sec, ssid, passphrase):
         response = tp.send_data('prov-config', message)
         return (prov.config_set_config_response(sec, response) == 0)
     except RuntimeError as e:
-        print(e)
+        on_except(e)
         return None
 
 def apply_wifi_config(tp, sec):
@@ -105,7 +114,7 @@ def apply_wifi_config(tp, sec):
         response = tp.send_data('prov-config', message)
         return (prov.config_set_config_response(sec, response) == 0)
     except RuntimeError as e:
-        print(e)
+        on_except(e)
         return None
 
 def get_wifi_config(tp, sec):
@@ -114,7 +123,7 @@ def get_wifi_config(tp, sec):
         response = tp.send_data('prov-config', message)
         return prov.config_get_status_response(sec, response)
     except RuntimeError as e:
-        print(e)
+        on_except(e)
         return None
 
 if __name__ == '__main__':