espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Example tests updated to enable exception throwing feature of esp_prov
This commit is contained in:
Anurag Kar
2018-11-28 18:01:57 +05:30
parent 3fe8065b7f
commit 5e0d222188
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/provisioning/ble_prov/ble_prov_test.py
View File

@@ -38,6 +38,9 @@ import IDF
idf_path = os.environ['IDF_PATH'] idf_path = os.environ['IDF_PATH']
esp_prov = imp.load_source("esp_prov", idf_path + "/tools/esp_prov/esp_prov.py") 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") @IDF.idf_example_test(env_tag="Example_WIFI_BT")
def test_examples_provisioning_ble(env, extra_data): def test_examples_provisioning_ble(env, extra_data):
# Acquire DUT # Acquire DUT

3
examples/provisioning/softap_prov/softap_prov_test.py
View File

@@ -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") 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") 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") @IDF.idf_example_test(env_tag="Example_WIFI_BT")
def test_examples_provisioning_softap(env, extra_data): def test_examples_provisioning_softap(env, extra_data):
# Acquire DUT # Acquire DUT

23
tools/esp_prov/esp_prov.py
View File

@@ -29,6 +29,15 @@ import security
import transport import transport
import prov 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): def get_security(secver, pop=None, verbose=False):
if secver == 1: if secver == 1:
return security.Security1(pop, verbose) return security.Security1(pop, verbose)
@@ -53,7 +62,7 @@ def get_transport(sel_transport, softap_endpoint=None, ble_devname=None):
tp = transport.Transport_Console() tp = transport.Transport_Console()
return tp return tp
except RuntimeError as e: except RuntimeError as e:
print(e) on_except(e)
return None return None
def version_match(tp, protover): def version_match(tp, protover):
@@ -63,7 +72,7 @@ def version_match(tp, protover):
return False return False
return True return True
except RuntimeError as e: except RuntimeError as e:
print(e) on_except(e)
return None return None
def establish_session(tp, sec): def establish_session(tp, sec):
@@ -78,7 +87,7 @@ def establish_session(tp, sec):
return False return False
return True return True
except RuntimeError as e: except RuntimeError as e:
print(e) on_except(e)
return None return None
def custom_config(tp, sec, custom_info, custom_ver): 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) response = tp.send_data('custom-config', message)
return (prov.custom_config_response(sec, response) == 0) return (prov.custom_config_response(sec, response) == 0)
except RuntimeError as e: except RuntimeError as e:
print(e) on_except(e)
return None return None
def send_wifi_config(tp, sec, ssid, passphrase): 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) response = tp.send_data('prov-config', message)
return (prov.config_set_config_response(sec, response) == 0) return (prov.config_set_config_response(sec, response) == 0)
except RuntimeError as e: except RuntimeError as e:
print(e) on_except(e)
return None return None
def apply_wifi_config(tp, sec): def apply_wifi_config(tp, sec):
@@ -105,7 +114,7 @@ def apply_wifi_config(tp, sec):
response = tp.send_data('prov-config', message) response = tp.send_data('prov-config', message)
return (prov.config_set_config_response(sec, response) == 0) return (prov.config_set_config_response(sec, response) == 0)
except RuntimeError as e: except RuntimeError as e:
print(e) on_except(e)
return None return None
def get_wifi_config(tp, sec): def get_wifi_config(tp, sec):
@@ -114,7 +123,7 @@ def get_wifi_config(tp, sec):
response = tp.send_data('prov-config', message) response = tp.send_data('prov-config', message)
return prov.config_get_status_response(sec, response) return prov.config_get_status_response(sec, response)
except RuntimeError as e: except RuntimeError as e:
print(e) on_except(e)
return None return None
if __name__ == '__main__': if __name__ == '__main__':