Improve test

Author: bjoernQ

qa-test/src/bin/embassy_wifi_drop.rs

@@ -7,7 +7,6 @@
 #![no_main]
 
 use embassy_executor::Spawner;
-use embassy_time::Duration;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
@@ -18,14 +17,15 @@ use esp_hal::{
 };
 use esp_println::println;
 use esp_radio::wifi::{ModeConfig, sta::StationConfig};
+use smoltcp::phy::Device;
 
 esp_bootloader_esp_idf::esp_app_desc!();
 
 const SSID: &str = env!("SSID");
 const PASSWORD: &str = env!("PASSWORD");
 
 #[esp_rtos::main]
-async fn main(_spawner: Spawner) -> ! {
+async fn main(_spawner: Spawner) {
     esp_println::logger::init_logger_from_env();
     let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
     let peripherals = esp_hal::init(config);
@@ -39,39 +39,83 @@ async fn main(_spawner: Spawner) -> ! {
     esp_rtos::start(timg0.timer0, sw_int.software_interrupt0);
 
     let mut wifi = peripherals.WIFI;
-    let (mut controller, interfaces) =
-        esp_radio::wifi::new(wifi.reborrow(), Default::default()).unwrap();
-
-    let station_config = ModeConfig::Station(
-        StationConfig::default()
-            .with_ssid(SSID.into())
-            .with_password(PASSWORD.into()),
-    );
-    controller.set_config(&station_config).unwrap();
-    controller.start_async().await.unwrap();
-    controller.connect_async().await.unwrap();
-
-    let mut wifi_interface = interfaces.station;
-
-    use smoltcp::phy::Device;
-    let token = wifi_interface.transmit(smoltcp::time::Instant::from_millis(
-        esp_hal::time::Instant::now()
-            .duration_since_epoch()
-            .as_millis() as i64,
-    ));
-
-    println!("got token {}", token.is_some());
-
-    core::mem::drop(controller);
-
-    if let Some(token) = token {
-        token.consume_token(10, |tx| tx.fill(0));
-        println!("tx done");
-    } else {
-        println!("no token");
+    {
+        let (mut controller, interfaces) =
+            esp_radio::wifi::new(wifi.reborrow(), Default::default()).unwrap();
+
+        let mut wifi_interface = interfaces.station;
+
+        let token = wifi_interface.transmit(smoltcp::time::Instant::from_millis(
+            esp_hal::time::Instant::now()
+                .duration_since_epoch()
+                .as_millis() as i64,
+        ));
+        assert!(matches!(token, None));
+
+        let station_config = ModeConfig::Station(
+            StationConfig::default()
+                .with_ssid(SSID.into())
+                .with_password(PASSWORD.into()),
+        );
+        controller.set_config(&station_config).unwrap();
+        controller.start_async().await.unwrap();
+        controller.connect_async().await.unwrap();
+
+        let token = wifi_interface.transmit(smoltcp::time::Instant::from_millis(
+            esp_hal::time::Instant::now()
+                .duration_since_epoch()
+                .as_millis() as i64,
+        ));
+
+        println!("got token {}", token.is_some());
+
+        core::mem::drop(controller);
+
+        if let Some(token) = token {
+            token.consume_token(10, |tx| tx.fill(0));
+            println!("survived consumer_token");
+        } else {
+            println!("no token");
+        }
+
+        let token = wifi_interface.transmit(smoltcp::time::Instant::from_millis(
+            esp_hal::time::Instant::now()
+                .duration_since_epoch()
+                .as_millis() as i64,
+        ));
+        assert!(matches!(token, None));
     }
 
-    loop {
-        embassy_time::Timer::after(Duration::from_millis(10)).await;
+    {
+        let (mut controller, interfaces) =
+            esp_radio::wifi::new(wifi.reborrow(), Default::default()).unwrap();
+
+        let station_config = ModeConfig::Station(
+            StationConfig::default()
+                .with_ssid(SSID.into())
+                .with_password(PASSWORD.into()),
+        );
+        controller.set_config(&station_config).unwrap();
+        controller.start_async().await.unwrap();
+        controller.connect_async().await.unwrap();
+
+        let mut wifi_interface = interfaces.station;
+
+        let token = wifi_interface.transmit(smoltcp::time::Instant::from_millis(
+            esp_hal::time::Instant::now()
+                .duration_since_epoch()
+                .as_millis() as i64,
+        ));
+
+        println!("got token {}", token.is_some());
+
+        if let Some(token) = token {
+            token.consume_token(10, |tx| tx.fill(0));
+            println!("tx done");
+        } else {
+            println!("no token");
+        }
     }
+
+    println!("Done");
 }