Align MobileHarness wifi decorator behavior with Tradefed (attempts, timeout, retry behavior).

PiperOrigin-RevId: 943661039

Author: OmniLab Team

src/java/com/google/wireless/qa/mobileharness/shared/api/decorator/AndroidSetWifiDecorator.java

@@ -40,8 +40,11 @@
 @DecoratorAnnotation(help = "For setting the device wifi ssid before the test is run.")
 public class AndroidSetWifiDecorator extends LifecycleDecorator
     implements SpecConfigable<AndroidSetWifiDecoratorSpec> {
-  /** The waiting time of timeout to connect to the ssid. */
-  protected static final Duration TIMEOUT_SSID_CONNECTION_TIME = Duration.ofMinutes(2);
+  /**
+   * The waiting time of timeout to connect to the ssid. 5 mins are useful when using 6G WiFi AP
+   * because it has multiple frequency bands.
+   */
+  protected static final Duration TIMEOUT_SSID_CONNECTION_TIME = Duration.ofMinutes(5);
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
@@ -67,7 +70,7 @@ protected void setUp(SetupContext context) throws MobileHarnessException, Interr
     String wifiSsid;
     String wifiPsk;
     boolean wifiScanSsid = false;
-    int retryNum = spec.hasWifiRetryNum() ? spec.getWifiRetryNum() : 0;
+    int retryNum = spec.getWifiRetryNum();
     boolean wifiSsidOptional = spec.getWifiSsidOptional();
     if (spec.getUseDefaultSsid()) {
       // Get the wifi config from the device property.

src/java/com/google/wireless/qa/mobileharness/shared/proto/spec/decorator/android_set_wifi_decorator_spec.proto

@@ -48,11 +48,10 @@ message AndroidSetWifiDecoratorSpec {
       [(field_detail) = { help: "Whether to scan for hidden SSID" }];
 
   optional int32 wifi_retry_num = 5 [
-    default = 0,
+    default = 3,
     (field_detail) = {
-      help: "Nums of retrying to connect to the wifi. Default value is 0. 5 is "
-            "max allowed. For normal usage, we do suggest not to set it larger "
-            "than 2 to save waiting time."
+      help: "Nums of retrying to connect to the wifi. Default value is 3. 5 is "
+            "max allowed."
     }
   ];
 

src/javatests/com/google/wireless/qa/mobileharness/shared/api/decorator/AndroidSetWifiDecoratorTest.java

@@ -99,8 +99,8 @@ public void testSetWifi_specifySsidAndPsk() throws MobileHarnessException, Inter
                 .setWifiSsid(WIFI_SSID)
                 .setWifiPsk(WIFI_PSK)
                 .setScanSsid(false)
-                .setWaitTimeout(Duration.ofMinutes(2))
-                .setRetryNum(0)
+                .setWaitTimeout(Duration.ofMinutes(5))
+                .setRetryNum(3)
                 .build(),
             log);
     verify(decoratedDriver).run(testInfo);
@@ -126,8 +126,8 @@ public void testSetWifi_specifySsidAndScanSsid()
                 .setWifiSsid(WIFI_SSID)
                 .setWifiPsk(WIFI_PSK)
                 .setScanSsid(true)
-                .setWaitTimeout(Duration.ofMinutes(2))
-                .setRetryNum(0)
+                .setWaitTimeout(Duration.ofMinutes(5))
+                .setRetryNum(3)
                 .build(),
             log);
     verify(decoratedDriver).run(testInfo);
@@ -170,8 +170,8 @@ public void testSetWifi_defaultConfig_success()
                 .setWifiSsid("ssid1")
                 .setWifiPsk("psk1")
                 .setScanSsid(false)
-                .setWaitTimeout(Duration.ofMinutes(2))
-                .setRetryNum(0)
+                .setWaitTimeout(Duration.ofMinutes(5))
+                .setRetryNum(3)
                 .build(),
             log);
     verify(decoratedDriver).run(testInfo);
@@ -210,7 +210,7 @@ public void testSetWifi_specifyRetryNum() throws MobileHarnessException, Interru
                 .setWifiSsid(WIFI_SSID)
                 .setWifiPsk(WIFI_PSK)
                 .setScanSsid(false)
-                .setWaitTimeout(Duration.ofMinutes(2))
+                .setWaitTimeout(Duration.ofMinutes(5))
                 .setRetryNum(WIFI_RETRY_NUM)
                 .build(),
             log);