Skip to content

Commit e969a5e

Browse files
projectgusespressif-bot
authored andcommitted
ci provisioning: Use strings instead of "magic numbers" for connection state
1 parent 05ef08b commit e969a5e

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

examples/provisioning/legacy/ble_prov/ble_prov_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ def test_examples_provisioning_ble(env, extra_data):
8787
time.sleep(5)
8888
print("Wi-Fi connection state")
8989
ret = esp_prov.get_wifi_config(transport, security)
90-
if (ret == 1):
90+
if (ret == "connecting"):
9191
continue
92-
elif (ret == 0):
92+
elif (ret == "connected"):
9393
print("Provisioning was successful")
9494
success = True
9595
break

examples/provisioning/legacy/softap_prov/softap_prov_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ def test_examples_provisioning_softap(env, extra_data):
101101
time.sleep(5)
102102
print("Wi-Fi connection state")
103103
ret = esp_prov.get_wifi_config(transport, security)
104-
if (ret == 1):
104+
if (ret == "connecting"):
105105
continue
106-
elif (ret == 0):
106+
elif (ret == "connected"):
107107
print("Provisioning was successful")
108108
success = True
109109
break

examples/provisioning/wifi_prov_mgr/wifi_prov_mgr_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ def test_examples_wifi_prov_mgr(env, extra_data):
9696
time.sleep(5)
9797
print("Wi-Fi connection state")
9898
ret = esp_prov.get_wifi_config(transport, security)
99-
if (ret == 1):
99+
if (ret == "connecting"):
100100
continue
101-
elif (ret == 0):
101+
elif (ret == "connected"):
102102
print("Provisioning was successful")
103103
success = True
104-
elif (ret == 3 and retry < 3):
104+
elif (ret == "failed" and retry < 3):
105105
retry = retry + 1
106106
print("Connection failed.. retry again...: ", ret)
107107
continue

tools/esp_prov/esp_prov.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,9 @@ def desc_format(*args):
475475
time.sleep(5)
476476
print("\n==== Wi-Fi connection state ====")
477477
ret = get_wifi_config(obj_transport, obj_security)
478-
if (ret == 1):
478+
if (ret == "connecting"):
479479
continue
480-
elif (ret == 0):
480+
elif (ret == "connected"):
481481
print("==== Provisioning was successful ====")
482482
else:
483483
print("---- Provisioning failed ----")

tools/esp_prov/prov/wifi_prov.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,25 @@ def config_get_status_response(security_ctx, response_data):
4545
cmd_resp1.ParseFromString(decrypted_message)
4646
print_verbose(security_ctx, "Response type " + str(cmd_resp1.msg))
4747
print_verbose(security_ctx, "Response status " + str(cmd_resp1.resp_get_status.status))
48+
4849
if cmd_resp1.resp_get_status.sta_state == 0:
4950
print("++++ WiFi state: " + "connected ++++")
51+
return "connected"
5052
elif cmd_resp1.resp_get_status.sta_state == 1:
5153
print("++++ WiFi state: " + "connecting... ++++")
54+
return "connecting"
5255
elif cmd_resp1.resp_get_status.sta_state == 2:
5356
print("++++ WiFi state: " + "disconnected ++++")
57+
return "disconnected"
5458
elif cmd_resp1.resp_get_status.sta_state == 3:
5559
print("++++ WiFi state: " + "connection failed ++++")
5660
if cmd_resp1.resp_get_status.fail_reason == 0:
5761
print("++++ Failure reason: " + "Incorrect Password ++++")
5862
elif cmd_resp1.resp_get_status.fail_reason == 1:
5963
print("++++ Failure reason: " + "Incorrect SSID ++++")
60-
return cmd_resp1.resp_get_status.sta_state
64+
return "failed"
65+
return "unknown"
66+
6167

6268

6369
def config_set_config_request(security_ctx, ssid, passphrase):

0 commit comments

Comments
 (0)