Merge pull request #11409 from dmaziec1/esp8266-nonblocking

0xc0170 · web-flow · commit ac7b851ba0ea · 2019-09-13T16:12:13.000+02:00
esp8266 nonblocking connect/disconnect
diff --git a/TESTS/network/wifi/README.md b/TESTS/network/wifi/README.md
@@ -62,7 +62,7 @@ Please refer to the following table for priorities of test cases. Priorities are
 | 9   | WIFI_CONNECT_PARAMS_CHANNEL             |                            | SHOULD   |
 | 10  | WIFI_CONNECT_PARAMS_CHANNEL_FAIL        |                            | SHOULD   |
 | 11  | WIFI_CONNECT                            |                            | MUST     |
-| 12  | WIFI_CONNECT_NONBLOCK                   |                            | SHOULD   |
+| 12  | WIFI_CONNECT_DISCONNECT_NONBLOCK        |                            | SHOULD   |
 | 13  | WIFI_CONNECT_SECURE                     | With security type:        |          |
 |     |                                         | NSAPI_SECURITY_WEP         | SHOULD   |
 |     |                                         | NSAPI_SECURITY_WPA         | SHOULD   |
@@ -385,7 +385,7 @@ Test `WiFiInterface::connect()` without parameters. Use `set_credentials()` for
 
 `connect()` calls return `NSAPI_ERROR_OK`.
 
-### WIFI_CONNECT_NONBLOCK
+### WIFI_CONNECT_DISCONNECT_NONBLOCK
 
 **Description:**
 
@@ -399,18 +399,24 @@ Test `WiFiInterface::connect()` and `WiFiInterface::disconnect()` in non-blockin
 
 1.  Initialize the driver.
 2.  `Call WiFiInterface::set_credentials( <ssid:unsecure>, NULL)`.
-3.  `Call WiFiInterface::connect()`.
-4.  `Call WiFiInterface::set_blocking(false)`
-5.  `Call WiFiInterface::get_connection_status()`
-6.  `disconnect()`
-7.  `Call WiFiInterface::get_connection_status()`
-8.  `Call WiFiInterface::set_blocking(true)`
+3.  `Call WiFiInterface::set_blocking(false)`
+4.  `Call WiFiInterface::connect()`.
+5.  `Cal WiFiInterface::set_credentials(const char *ssid, const char *pass, nsapi_security_t security)`
+6.  `Call WiFiInterface::connect()`.
+7.  `disconnect()`
+8.  `disconnect()`
+9. `Call WiFiInterface::set_blocking(true)`
 
 **Expected result:**
 
- In case of drivers which do not support asynchronous mode `set_blocking(false)` call returns `NSAPI_ERROR_UNSUPPORTED` and skips test case, otherwise:
-`connect()` call returns  `NSAPI_ERROR_OK`. To confirm connection `get_connection_status()` calls return `NSAPI_STATUS_GLOBAL_UP` or `NSAPI_STATUS_LOCAL_UP`.
-`disconnect()` call returns `NSAPI_ERROR_OK`. To confirm disconnection `get_connection_status()` calls return `NSAPI_STATUS_DISCONNECTED`.
+1. Drivers which do not support asynchronous mode `set_blocking(false)` call returns `NSAPI_ERROR_UNSUPPORTED` and skips test case.
+2. `connect()` call returns  `NSAPI_ERROR_OK`. 
+3. `set_credentials(...)` call returns `NSAPI_ERROR_BUSY`. 
+4. Second `connect()` call returns `NSAPI_ERROR_BUSY` or `NSAPI_ERROR_IS_CONNECTED`.
+5. Attached callback informs about connection status. Callback reports status `NSAPI_STATUS_CONNECTING` and `NSAPI_STATUS_CONNECTED`. 
+6. `disconnect()` call returns `NSAPI_ERROR_OK`. 
+7. Second `disconnect()` call returns `NSAPI_ERROR_BUSY` or `NSAPI_ERROR_IS_CONNECTED`. 
+8. To confirm disconnection callback reports `NSAPI_STATUS_DISCONNECTED`.
 
 ### WIFI_CONNECT_SECURE
 
diff --git a/TESTS/network/wifi/main.cpp b/TESTS/network/wifi/main.cpp
@@ -75,7 +75,7 @@ Case cases[] = {
     Case("WIFI-CONNECT-PARAMS-VALID-UNSECURE", wifi_connect_params_valid_unsecure),
     Case("WIFI-CONNECT", wifi_connect),
     //Most boards are not passing this test, but they should if they support non-blocking API.
-    //Case("WIFI-CONNECT-NONBLOCKING", wifi_connect_nonblock),
+    //Case("WIFI_CONNECT_DISCONNECT_NONBLOCK", wifi_connect_disconnect_nonblock),
     Case("WIFI-CONNECT-DISCONNECT-REPEAT", wifi_connect_disconnect_repeat),
 #endif
 #if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_connect_disconnect_nonblock.cpp b/TESTS/network/wifi/wifi_connect_disconnect_nonblock.cpp
@@ -29,6 +29,7 @@ using namespace utest::v1;
 nsapi_connection_status_t status_connection;
 Semaphore sem_conn(0, 1);
 Semaphore sem_disconn(0, 1);
+Semaphore sem_connecting(0, 1);
 void status_callback(nsapi_event_t e, intptr_t d)
 {
     if (d == NSAPI_STATUS_LOCAL_UP || d == NSAPI_STATUS_GLOBAL_UP) {
@@ -40,26 +41,40 @@ void status_callback(nsapi_event_t e, intptr_t d)
         status_connection = (nsapi_connection_status_t)d;
         sem_disconn.release();
     }
+
+    if (d == NSAPI_STATUS_CONNECTING) {
+        status_connection = (nsapi_connection_status_t)d;
+        sem_connecting.release();
+    }
 }
 
-void wifi_connect_nonblock(void)
+void wifi_connect_disconnect_nonblock(void)
 {
     WiFiInterface *wifi = get_interface();
     char ssid[SSID_MAX_LEN + 1] = MBED_CONF_APP_WIFI_UNSECURE_SSID;
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(ssid, NULL));
     wifi->attach(status_callback);
     TEST_SKIP_UNLESS(wifi->set_blocking(false) != NSAPI_ERROR_UNSUPPORTED);
     nsapi_error_t ret = wifi->connect();
+    nsapi_error_t ret2 = wifi->set_credentials("1234", "1234", NSAPI_SECURITY_WPA_WPA2);
+    nsapi_error_t ret3 = wifi->connect();
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, ret);
-    bool res = sem_conn.try_acquire_for(30000);
+    TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_BUSY, ret2);
+    TEST_ASSERT_TRUE(ret3 == NSAPI_ERROR_BUSY || ret3 == NSAPI_ERROR_IS_CONNECTED);
+    bool res = sem_connecting.try_acquire_for(30000);
+    TEST_ASSERT_EQUAL_INT(NSAPI_STATUS_CONNECTING, status_connection);
+    res = sem_conn.try_acquire_for(30000);
     TEST_ASSERT_TRUE(res == true);
     TEST_ASSERT_TRUE(status_connection == NSAPI_STATUS_GLOBAL_UP || status_connection == NSAPI_STATUS_LOCAL_UP);
     ret = wifi->disconnect();
+    ret3 = wifi->disconnect();
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, ret);
+    TEST_ASSERT_TRUE(ret3 == NSAPI_ERROR_BUSY || ret3 == NSAPI_ERROR_NO_CONNECTION);
     res = sem_disconn.try_acquire_for(30000);
     TEST_ASSERT_TRUE(res == true);
     TEST_ASSERT_EQUAL_INT(NSAPI_STATUS_DISCONNECTED, status_connection);
     wifi->set_blocking(true);
+    wifi->attach(0);
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_tests.h b/TESTS/network/wifi/wifi_tests.h
@@ -63,8 +63,8 @@ void wifi_connect_params_channel_fail(void);
 /** Test WiFiInterface::connect() without parameters. Use set_credentials() for setting parameters. */
 void wifi_connect(void);
 
-/** Test WiFiInterface::connect() in nonblocking mode. Use set_credentials() for setting parameters. */
-void wifi_connect_nonblock(void);
+/** Test WiFiInterface::connect() and disconnect() in nonblocking mode. Use set_credentials() for setting parameters. */
+void wifi_connect_disconnect_nonblock(void);
 
 /** Test WiFiInterface::connect() without parameters. Don't set parameters with set_credentials() */
 void wifi_connect_nocredentials(void);
diff --git a/components/wifi/esp8266-driver/ESP8266Interface.cpp b/components/wifi/esp8266-driver/ESP8266Interface.cpp
diff --git a/components/wifi/esp8266-driver/ESP8266Interface.h b/components/wifi/esp8266-driver/ESP8266Interface.h
