Creating a new suite "wifi_matfunc_preflight"
This has the same tests as does wifi_matfunc.
Creating new suite with different name so that we
can have matfunc run on preflight boards.
BUG=chromium:428945
TEST=None
Change-Id: Id24f5aaab8a4de0fff1de0a1879cda553e23ba40
Reviewed-on: https://chromium-review.googlesource.com/230587
Reviewed-by: Prashanth B <beeps@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>
Commit-Queue: Bindu Mahadev <bmahadev@chromium.org>
Tested-by: Bindu Mahadev <bmahadev@chromium.org>
diff --git a/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval b/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
index 2ec80c9..78ac3e9 100644
--- a/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
+++ b/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_BeaconInterval.wifi_bintval'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff b/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff
index 1296c6e..23dc6de 100644
--- a/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff
+++ b/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_BgscanBackoff.wifi_bgscan_backoff'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_CSADisconnect/control b/server/site_tests/network_WiFi_CSADisconnect/control
index a2624ea..b68ce48 100644
--- a/server/site_tests/network_WiFi_CSADisconnect/control
+++ b/server/site_tests/network_WiFi_CSADisconnect/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_CSADisconnect'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChannelScanDwellTime/control b/server/site_tests/network_WiFi_ChannelScanDwellTime/control
index a22ffd3..0b1757b 100644
--- a/server/site_tests/network_WiFi_ChannelScanDwellTime/control
+++ b/server/site_tests/network_WiFi_ChannelScanDwellTime/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ChannelScanDwellTime'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi b/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
index b5886b9..57b4553 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.autoconnectWiFi'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi b/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
index 80cfe8a..83bd7b9 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.enableDisableWiFi'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks b/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
index 0f503b6..e5cc32e 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.findVerifyWiFiNetworks'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks b/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
index 1994ec8..d70c4be 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.transitionWiFiNetworks'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ConnectionIdentifier/control b/server/site_tests/network_WiFi_ConnectionIdentifier/control
index 4e38137..e0adfed 100644
--- a/server/site_tests/network_WiFi_ConnectionIdentifier/control
+++ b/server/site_tests/network_WiFi_ConnectionIdentifier/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ConnectionIdentifier'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period b/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period
index b1c48e8..9cce446 100644
--- a/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period
+++ b/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DTIMPeriod.wifi_DTIM_period'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisableEnable/control b/server/site_tests/network_WiFi_DisableEnable/control
index cb606a4..2014cde 100644
--- a/server/site_tests/network_WiFi_DisableEnable/control
+++ b/server/site_tests/network_WiFi_DisableEnable/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisableEnable'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisconnectClearsIP/control b/server/site_tests/network_WiFi_DisconnectClearsIP/control
index ba2be98..21a211b 100644
--- a/server/site_tests/network_WiFi_DisconnectClearsIP/control
+++ b/server/site_tests/network_WiFi_DisconnectClearsIP/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisconnectClearsIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_GTK/control b/server/site_tests/network_WiFi_GTK/control
index 702cc77..d739d4d 100644
--- a/server/site_tests/network_WiFi_GTK/control
+++ b/server/site_tests/network_WiFi_GTK/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_GTK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_HiddenRemains/control b/server/site_tests/network_WiFi_HiddenRemains/control
index 2548bd2..26ba98d 100644
--- a/server/site_tests/network_WiFi_HiddenRemains/control
+++ b/server/site_tests/network_WiFi_HiddenRemains/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_HiddenRemains'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_HiddenScan/control b/server/site_tests/network_WiFi_HiddenScan/control
index 23fdcaa..10b8739 100644
--- a/server/site_tests/network_WiFi_HiddenScan/control
+++ b/server/site_tests/network_WiFi_HiddenScan/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_HiddenScan'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS b/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
index a77a0dd..8543fb8 100644
--- a/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
+++ b/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_IBSS.wifi_IBSS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_LowInitialBitrates/control b/server/site_tests/network_WiFi_LowInitialBitrates/control
index a7fbdb3..6134c11 100644
--- a/server/site_tests/network_WiFi_LowInitialBitrates/control
+++ b/server/site_tests/network_WiFi_LowInitialBitrates/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_LowInitialBitrates'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid b/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid
index 753cd49..32284f5 100644
--- a/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid
+++ b/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_MaskedBSSID.wifi_masked_bssid'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MissingBeacons/control b/server/site_tests/network_WiFi_MissingBeacons/control
index d230e06..6e2f048 100644
--- a/server/site_tests/network_WiFi_MissingBeacons/control
+++ b/server/site_tests/network_WiFi_MissingBeacons/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_MissingBeacons'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MultiAuth/control b/server/site_tests/network_WiFi_MultiAuth/control
index 4bbe112..87b4759 100644
--- a/server/site_tests/network_WiFi_MultiAuth/control
+++ b/server/site_tests/network_WiFi_MultiAuth/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_MultiAuth'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss b/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
index 9e93a7d..ccea8bf 100644
--- a/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
+++ b/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_OverlappingBSSScan.wifi_obss'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PMKSACaching/control b/server/site_tests/network_WiFi_PMKSACaching/control
index c420856..3cc7203 100644
--- a/server/site_tests/network_WiFi_PMKSACaching/control
+++ b/server/site_tests/network_WiFi_PMKSACaching/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_PMKSACaching'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PTK/control b/server/site_tests/network_WiFi_PTK/control
index 7fe4cce..217406c 100644
--- a/server/site_tests/network_WiFi_PTK/control
+++ b/server/site_tests/network_WiFi_PTK/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_PTK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Powersave/control.wifi_ps b/server/site_tests/network_WiFi_Powersave/control.wifi_ps
index 15d7e48..5e43553 100644
--- a/server/site_tests/network_WiFi_Powersave/control.wifi_ps
+++ b/server/site_tests/network_WiFi_Powersave/control.wifi_ps
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Powersave.wifi_ps'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Prefer5Ghz/control b/server/site_tests/network_WiFi_Prefer5Ghz/control
index 56c3a29..7af926f 100644
--- a/server/site_tests/network_WiFi_Prefer5Ghz/control
+++ b/server/site_tests/network_WiFi_Prefer5Ghz/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Prefer5Ghz'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileBasic/control b/server/site_tests/network_WiFi_ProfileBasic/control
index e231713..4eb5243 100644
--- a/server/site_tests/network_WiFi_ProfileBasic/control
+++ b/server/site_tests/network_WiFi_ProfileBasic/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ProfileBasic'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileGUID/control b/server/site_tests/network_WiFi_ProfileGUID/control
index 1631486..83ff227 100644
--- a/server/site_tests/network_WiFi_ProfileGUID/control
+++ b/server/site_tests/network_WiFi_ProfileGUID/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ProfileGUID'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RateControl/control b/server/site_tests/network_WiFi_RateControl/control
index 775d3f1..c7dfb2a 100644
--- a/server/site_tests/network_WiFi_RateControl/control
+++ b/server/site_tests/network_WiFi_RateControl/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_RateControl'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Reassociate/control b/server/site_tests/network_WiFi_Reassociate/control
index 804bb0b..f0e6952 100644
--- a/server/site_tests/network_WiFi_Reassociate/control
+++ b/server/site_tests/network_WiFi_Reassociate/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Reassociate'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Regulatory/control b/server/site_tests/network_WiFi_Regulatory/control
index 4c53b9d..6f0f4f1 100644
--- a/server/site_tests/network_WiFi_Regulatory/control
+++ b/server/site_tests/network_WiFi_Regulatory/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Regulatory'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS b/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
index c12f5ed..ad063ea 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roam1xTLS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roamNone b/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
index 5d4a98b..3cd7b5e 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roamNone'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP b/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
index fdde124..46db137 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roamWEP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA b/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
index 09a567c..b4e9729 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roamWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag b/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
index fea092c..4130e6e 100644
--- a/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
+++ b/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_RxFrag.wifi_rxfrag'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ScanPerformance/control b/server/site_tests/network_WiFi_ScanPerformance/control
index 7a30e1f..501ab72 100644
--- a/server/site_tests/network_WiFi_ScanPerformance/control
+++ b/server/site_tests/network_WiFi_ScanPerformance/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ScanPerformance'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SecChange/control b/server/site_tests/network_WiFi_SecChange/control
index 5c33e50..1facb06 100644
--- a/server/site_tests/network_WiFi_SecChange/control
+++ b/server/site_tests/network_WiFi_SecChange/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SecChange'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
index b40193b..5d6f223 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11a'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
index 9213477..66ceba1 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11b'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
index 6393ca9..c5f6df1 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11g'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
index d5b5b9c..92a0a26 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_PEAP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
index aff1c0b..a5bd339 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_TTLS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
index af500f0..9790c77 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WEP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
index c803a2f..f91e197 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
index 64d354a..2639583 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check24HT20'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
index 9530b86..e1ec5e4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check24HT40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
index 8767922..2c37f7d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5HT20'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
index 0538eeb..cf66d79 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5HT40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
index dad5c7d..2b5d6f3 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5VHT80'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
index 54da3aa..1d05058 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkDFS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
index 85806f7..d5829c2 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkHidden'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
index a62f815..2f64fb0 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkHiddenWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
index be04156..fc01ebb 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkMixedWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
index 1b90eaa..decd6ae 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkNonAsciiSSID'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
index a6ff841..9f17703 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkOddWPAPassphrases'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
index 87dc969..8ccafe6 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkRawPMK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
index 822bde9..21fd78d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkSSIDLimits'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
index 7ea36ec..d3b1ca7 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP104'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
index 4811ac5..050298b 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
index 0ccbbb3..923e7b4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
index ebd7dcd..dca1bc9 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2_CCMP_PMF'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
index 178a04f..404b884 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2_TKIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
index 0e89440..2e2406a 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_CCMP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
index c30df9f..6cf470a 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_TKIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
index b16031f..db2d8ec 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_multi'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SuspendTwice/control b/server/site_tests/network_WiFi_SuspendTwice/control
index e421da2..6a80889 100644
--- a/server/site_tests/network_WiFi_SuspendTwice/control
+++ b/server/site_tests/network_WiFi_SuspendTwice/control
@@ -7,8 +7,8 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
# TODO(wiley) When we have servos on our test machines, put this in
-# wifi_matfunc. Currently, it kills to many device on
-# broken suspends.
+# wifi_matfunc, wifi_matfunc_preflight. Currently, it kills to many
+# device on broken suspends.
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_TDLSPing/control b/server/site_tests/network_WiFi_TDLSPing/control
index 5a8e6ab..f618343 100644
--- a/server/site_tests/network_WiFi_TDLSPing/control
+++ b/server/site_tests/network_WiFi_TDLSPing/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_TDLSPing'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_UpdateRouter/control b/server/site_tests/network_WiFi_UpdateRouter/control
index cab49f0..0e3b08c 100644
--- a/server/site_tests/network_WiFi_UpdateRouter/control
+++ b/server/site_tests/network_WiFi_UpdateRouter/control
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-SUITE = 'wifi_matfunc, wifi_release, wifi_perf'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release, wifi_perf'
DOC = """
This test updates the router in a WiFi cell to the latest stable version.
diff --git a/server/site_tests/network_WiFi_VerifyRouter/control b/server/site_tests/network_WiFi_VerifyRouter/control
index 702f746..7bed00a 100644
--- a/server/site_tests/network_WiFi_VerifyRouter/control
+++ b/server/site_tests/network_WiFi_VerifyRouter/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_VerifyRouter'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_VisibleScan/control b/server/site_tests/network_WiFi_VisibleScan/control
index 535e249..01085db 100644
--- a/server/site_tests/network_WiFi_VisibleScan/control
+++ b/server/site_tests/network_WiFi_VisibleScan/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_VisibleScan'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index bd9fd47..22bca57 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -254,7 +254,7 @@
[WiFi_MatFuncDaily_Preflight]
run_on: nightly
-suite: wifi_matfunc
+suite: wifi_matfunc_preflight
branch_specs: ==tot
pool: wificell_preflight
@@ -623,7 +623,7 @@
[WeeklyWiFi_MatFuncDaily_Preflight]
run_on: weekly
-suite: wifi_matfunc
+suite: wifi_matfunc_preflight
branch_specs: >=R40
pool: wificell_preflight
diff --git a/test_suites/control.wifi_matfunc_preflight b/test_suites/control.wifi_matfunc_preflight
new file mode 100644
index 0000000..d84cd5c
--- /dev/null
+++ b/test_suites/control.wifi_matfunc_preflight
@@ -0,0 +1,39 @@
+# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "bmahadev@chromium.org, wiley@chromium.org"
+NAME = "wifi_matfunc_preflight"
+PURPOSE = "Verify basic WiFi functionality."
+CRITERIA = "All tests with SUITE=wifi_matfunc_preflight must pass."
+
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+This is an example of a dynamic test suite.
+
+@param build: The name of the image to test.
+ Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+ board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+@param file_bugs: If True your suite will file bugs on failures.
+@param max_run_time: Amount of time each test shoud run in minutes.
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name=NAME, job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
+ max_runtime_mins=60, devserver_url=devserver_url,
+ version_prefix=provision.CROS_VERSION_PREFIX,
+ wait_for_results=wait_for_results, job_retry=job_retry)