Delete suite:wifi_matfunc_noservo
This is equivalent to wifi_matfunc, now that we've dropped servo
dependencies.
Generated by:
git grep -l wifi_matfunc_noservo | xargs sed -i -E \
-e "/wifi_matfunc_noservo/ {
s/noservo, /noservo/ ;
s/(, |)suite:wifi_matfunc_noservo//
}"
plus manual changes to
site_utils/attribute_whitelist.txt
test_suites/control.wifi_matfunc_noservo
docs/wificell.md
server/site_tests/network_WiFi_DisconnectReason/control.ap_send_chan_switch
BUG=chromium:688261
TEST=This is a cosmetic change. The only thing to test *should be* that
the tests enumerated for wifi_matfunc and wifi_release stay the same and
are not nuked by the cosmetic list formatting changes. List all tests that
are part of these suits before and after this change, and ensure that the
list is the same in both cases:
$ git checkout master
(chroot) test_that -b hatch ${IP} suite:wifi_matfunc --pretend | \
tee -a /tmp/matfunc_before.txt
$ git checkout delete-noservo # branch with this CL
(chroot) test_that -b hatch ${IP} suite:wifi_matfunc --pretend | \
tee -a /tmp/matfunc_after.txt
Manual wrangling (vim macros) to delete timestamps and temporary
directory names in both files, then this should have no output.
$ diff -u /tmp/matfunc_before.txt /tmp/matfunc_after.txt
Change-Id: I804709f0c0d51151b45e18a329e1e084961d6e6c
Signed-off-by: Brian Norris <[email protected]>
Signed-off-by: Kirtika Ruchandani <[email protected]>
Reviewed-on: https://chromium-review.googlesource.com/1519210
Commit-Ready: Kirtika Ruchandani <[email protected]>
Tested-by: Kirtika Ruchandani <[email protected]>
Reviewed-by: Kirtika Ruchandani <[email protected]>
diff --git a/client/site_tests/network_ShillStability/control b/client/site_tests/network_ShillStability/control
index c302069..da0bd9e 100644
--- a/client/site_tests/network_ShillStability/control
+++ b/client/site_tests/network_ShillStability/control
@@ -5,8 +5,7 @@
AUTHOR = 'kirtika'
NAME = 'network_ShillStability'
ATTRIBUTES = ('suite:network_nightly, suite:wifi_matfunc,'
- 'suite:wifi_matfunc_noservo, suite:bvt-perbuild,'
- 'suite:wificell-pre-cq')
+ 'suite:bvt-perbuild, suite:wificell-pre-cq')
TIME = 'SHORT'
TEST_TYPE = 'client'
diff --git a/client/site_tests/network_WlanDriver/control b/client/site_tests/network_WlanDriver/control
index 73adfa3..9d1b5e2 100644
--- a/client/site_tests/network_WlanDriver/control
+++ b/client/site_tests/network_WlanDriver/control
@@ -5,8 +5,7 @@
AUTHOR = 'pstew, quiche, wiley'
NAME = 'network_WlanDriver'
ATTRIBUTES = ('suite:network_nightly, suite:wifi_matfunc,'
- 'suite:wifi_matfunc_noservo, suite:bvt-perbuild,'
- 'suite:wificell-pre-cq')
+ 'suite:bvt-perbuild, suite:wificell-pre-cq')
TIME = 'SHORT'
TEST_TYPE = 'client'
diff --git a/docs/wificell.md b/docs/wificell.md
index e96269f..312e1f6 100644
--- a/docs/wificell.md
+++ b/docs/wificell.md
@@ -35,8 +35,8 @@
## What suites should I run?
There are a variety of WiFi-related suites, but developers are commonly
-interested in the functionality (`wifi_matfunc` or its servo-less variant,
-`wifi_matfunc_noservo`) and performance (`wifi_perf`) suites.
+interested in the functionality (`wifi_matfunc`) and performance (`wifi_perf`)
+suites.
## Configuring DNS entries for test APs
diff --git a/server/site_tests/network_WiFi_BSSTMReq/control b/server/site_tests/network_WiFi_BSSTMReq/control
index aea8e3b..1f7dcd0 100644
--- a/server/site_tests/network_WiFi_BSSTMReq/control
+++ b/server/site_tests/network_WiFi_BSSTMReq/control
@@ -7,7 +7,7 @@
NAME = 'network_WiFi_BSSTMReq'
TEST_TYPE = 'Server'
#ATTRIBUTES = ('suite:wifi_endtoend, suite:wifi_release, '
-# 'suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+# 'suite:wifi_matfunc')
ATTRIBUTES = ('suite:wifi_flaky')
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval b/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
index 807e692..ccbd2ff 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_BgscanBackoff/control.5760noise_check b/server/site_tests/network_WiFi_BgscanBackoff/control.5760noise_check
index c3923ea..44aa639 100644
--- a/server/site_tests/network_WiFi_BgscanBackoff/control.5760noise_check
+++ b/server/site_tests/network_WiFi_BgscanBackoff/control.5760noise_check
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_BgscanBackoff.5760_noise_check'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 bd1c296..37e3cad 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_CSADisconnect/control b/server/site_tests/network_WiFi_CSADisconnect/control
index ee76eb4..e5e2e7e 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChannelScanDwellTime/control b/server/site_tests/network_WiFi_ChannelScanDwellTime/control
index a66aa05..3c0e32f 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ConnectionIdentifier/control b/server/site_tests/network_WiFi_ConnectionIdentifier/control
index 1f166e6..eea5131 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 4b6782b..3834c68 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisableEnable/control b/server/site_tests/network_WiFi_DisableEnable/control
index 8135fc4..bc30732 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
+ATTRIBUTES = ('suite:wifi_matfunc,'
'suite:wificell-pre-cq')
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_DisableRandomMACAddress/control b/server/site_tests/network_WiFi_DisableRandomMACAddress/control
index 8dc735c..f011afc 100644
--- a/server/site_tests/network_WiFi_DisableRandomMACAddress/control
+++ b/server/site_tests/network_WiFi_DisableRandomMACAddress/control
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = 'suite:wifi_matfunc, suite:wifi_matfunc_noservo'
+ATTRIBUTES = 'suite:wifi_matfunc'
DOC = """
This test verifies that MAC address randomization can be
diff --git a/server/site_tests/network_WiFi_DisconnectClearsIP/control b/server/site_tests/network_WiFi_DisconnectClearsIP/control
index b4672d0..2d00f2a 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisconnectReason/control.ap_gone b/server/site_tests/network_WiFi_DisconnectReason/control.ap_gone
index 4e878ef..4d7fb29 100644
--- a/server/site_tests/network_WiFi_DisconnectReason/control.ap_gone
+++ b/server/site_tests/network_WiFi_DisconnectReason/control.ap_gone
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisconnectReason.ap_gone'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisconnectReason/control.ap_send_chan_switch b/server/site_tests/network_WiFi_DisconnectReason/control.ap_send_chan_switch
index 02b6a23..80f2ad2 100644
--- a/server/site_tests/network_WiFi_DisconnectReason/control.ap_send_chan_switch
+++ b/server/site_tests/network_WiFi_DisconnectReason/control.ap_send_chan_switch
@@ -13,8 +13,7 @@
# Removing from all test suites for now.
ATTRIBUTES = (
-# 'suite:wifi_matfunc, '
-# 'suite:wifi_matfunc_noservo'
+# 'suite:wifi_matfunc'
)
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_DisconnectReason/control.deauth_client b/server/site_tests/network_WiFi_DisconnectReason/control.deauth_client
index 91ccda3..09d06f8 100644
--- a/server/site_tests/network_WiFi_DisconnectReason/control.deauth_client
+++ b/server/site_tests/network_WiFi_DisconnectReason/control.deauth_client
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisconnectReason.deauth_client'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisconnectReason/control.disable_client_wifi b/server/site_tests/network_WiFi_DisconnectReason/control.disable_client_wifi
index 1a4beb8..062bf64 100644
--- a/server/site_tests/network_WiFi_DisconnectReason/control.disable_client_wifi
+++ b/server/site_tests/network_WiFi_DisconnectReason/control.disable_client_wifi
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisconnectReason.disable_client_wifi'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisconnectReason/control.switch_ap b/server/site_tests/network_WiFi_DisconnectReason/control.switch_ap
index 49cbb79..bd83c3e 100644
--- a/server/site_tests/network_WiFi_DisconnectReason/control.switch_ap
+++ b/server/site_tests/network_WiFi_DisconnectReason/control.switch_ap
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisconnectReason.switch_ap'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_GTK/control b/server/site_tests/network_WiFi_GTK/control
index 6a1b22b..7e5af16 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_HiddenRemains/control b/server/site_tests/network_WiFi_HiddenRemains/control
index 3ce2914..db62bfd 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_HiddenScan/control b/server/site_tests/network_WiFi_HiddenScan/control
index bf24adc..7a48cc7 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 a8e9c23..7fad1ff 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_LinkMonitorFailure/control b/server/site_tests/network_WiFi_LinkMonitorFailure/control
index ef66ecf..cc93899 100644
--- a/server/site_tests/network_WiFi_LinkMonitorFailure/control
+++ b/server/site_tests/network_WiFi_LinkMonitorFailure/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_LinkMonitorFailure'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = "suite:wifi_matfunc, suite:wifi_matfunc_noservo"
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_LowInitialBitrates/control b/server/site_tests/network_WiFi_LowInitialBitrates/control
index c045670..88a5510 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MalformedProbeResp/control b/server/site_tests/network_WiFi_MalformedProbeResp/control
index 92d68ff..14205d6 100644
--- a/server/site_tests/network_WiFi_MalformedProbeResp/control
+++ b/server/site_tests/network_WiFi_MalformedProbeResp/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_MalformedProbeResp'
TIME = 'MEDIUM'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 692bbe8..af9d2e6 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MissingBeacons/control b/server/site_tests/network_WiFi_MissingBeacons/control
index 382cc38..bd48b1f 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MultiAuth/control b/server/site_tests/network_WiFi_MultiAuth/control
index 7cf7c92..be52bff 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_OverlappingBSSScan/control b/server/site_tests/network_WiFi_OverlappingBSSScan/control
index cd61626..252b211 100644
--- a/server/site_tests/network_WiFi_OverlappingBSSScan/control
+++ b/server/site_tests/network_WiFi_OverlappingBSSScan/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_OverlappingBSSScan'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PMKSACaching/control b/server/site_tests/network_WiFi_PMKSACaching/control
index 1b53188..20e5540 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PTK/control b/server/site_tests/network_WiFi_PTK/control
index 8ca701b..c6db9c5 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 d8574b6..d82dca8 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Prefer5Ghz/control b/server/site_tests/network_WiFi_Prefer5Ghz/control
index 98ad852..0e139ef 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileBasic/control b/server/site_tests/network_WiFi_ProfileBasic/control
index 1c67a1b..dc4497e 100644
--- a/server/site_tests/network_WiFi_ProfileBasic/control
+++ b/server/site_tests/network_WiFi_ProfileBasic/control
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_ProfileBasic'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wificell-pre-cq')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wificell-pre-cq')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileGUID/control b/server/site_tests/network_WiFi_ProfileGUID/control
index 1b82816..7d02584 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RandomMACAddress/control b/server/site_tests/network_WiFi_RandomMACAddress/control
index de159df..f5ed2b7 100644
--- a/server/site_tests/network_WiFi_RandomMACAddress/control
+++ b/server/site_tests/network_WiFi_RandomMACAddress/control
@@ -9,7 +9,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = 'suite:wifi_matfunc, suite:wifi_matfunc_noservo'
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test verifies that MAC address randomization can be
diff --git a/server/site_tests/network_WiFi_Reassociate/control b/server/site_tests/network_WiFi_Reassociate/control
index 7367c08..70e7cca 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Regulatory/control b/server/site_tests/network_WiFi_Regulatory/control
index 33c019b..ce10d97 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Reset/control b/server/site_tests/network_WiFi_Reset/control
index 8dbb35c..a2a120a 100644
--- a/server/site_tests/network_WiFi_Reset/control
+++ b/server/site_tests/network_WiFi_Reset/control
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = 'suite:wifi_matfunc, suite:wifi_matfunc_noservo'
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test verifies that if a network device can be reset from user space, that
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS b/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
index 99ce60c..afeea01 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 fe53aac..c89054a 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 864774d..26369f7 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 d7db5c2..d428a3f 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RoamDbus/control b/server/site_tests/network_WiFi_RoamDbus/control
index 61b6fd7..9c6e867 100644
--- a/server/site_tests/network_WiFi_RoamDbus/control
+++ b/server/site_tests/network_WiFi_RoamDbus/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_RoamDbus'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RoamFT/control.EAP b/server/site_tests/network_WiFi_RoamFT/control.EAP
index 84fa2d8..34c7cb5 100644
--- a/server/site_tests/network_WiFi_RoamFT/control.EAP
+++ b/server/site_tests/network_WiFi_RoamFT/control.EAP
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_RoamFT.EAP'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RoamFT/control.PSK b/server/site_tests/network_WiFi_RoamFT/control.PSK
index 40e3898..30838e1 100644
--- a/server/site_tests/network_WiFi_RoamFT/control.PSK
+++ b/server/site_tests/network_WiFi_RoamFT/control.PSK
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_RoamFT.PSK'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RoamFT/control.mixedEAP b/server/site_tests/network_WiFi_RoamFT/control.mixedEAP
index 90eaf67..20285d4 100644
--- a/server/site_tests/network_WiFi_RoamFT/control.mixedEAP
+++ b/server/site_tests/network_WiFi_RoamFT/control.mixedEAP
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_RoamFT.mixedEAP'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RoamFT/control.mixedPSK b/server/site_tests/network_WiFi_RoamFT/control.mixedPSK
index 3199078..9c76620 100644
--- a/server/site_tests/network_WiFi_RoamFT/control.mixedPSK
+++ b/server/site_tests/network_WiFi_RoamFT/control.mixedPSK
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_RoamFT.mixedPSK'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 8ea8411..79431d6 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ScanPerformance/control b/server/site_tests/network_WiFi_ScanPerformance/control
index ae8c3df..092caeb 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SecChange/control b/server/site_tests/network_WiFi_SecChange/control
index 5869e7f..9e14704 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SetOptionalDhcpProperties/control b/server/site_tests/network_WiFi_SetOptionalDhcpProperties/control
index d130987..540abc0 100644
--- a/server/site_tests/network_WiFi_SetOptionalDhcpProperties/control
+++ b/server/site_tests/network_WiFi_SetOptionalDhcpProperties/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SetOptionalDhcpProperties'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
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 07ea339..e0545cf 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11a'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 a3b017b..c6143a7 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11b'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 073d5d3..06dcd04 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
@@ -6,8 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11g'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi, suite:wificell-pre-cq')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release,'
+ 'subsystem:wifi, suite:wificell-pre-cq')
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 f3db683..1735a65 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_PEAP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 204b7dc..0e37918 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
@@ -6,8 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_TTLS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi, suite:wificell-pre-cq')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release,'
+ 'subsystem:wifi, suite:wificell-pre-cq')
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 5ec6473..a9397b0 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WEP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 87b1629..6b65ba1 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 2654c1f..32734d9 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check24HT20'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 59b0a3b..c37b4fe 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check24HT40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 ba72ef0..c4cccd5 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5HT20'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 3f7d03f..ddacda3 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5HT40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_mixed b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_mixed
index de1cce7..65994e5 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_mixed
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_mixed
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5VHT80_mixed'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_pure b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_pure
index 0efad46..59ee263 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_pure
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80_pure
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5VHT80_pure'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 37453e3..e535c1c 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkDFS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 558b6da..3da1368 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkHidden'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
index 3c61509..06a056b 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
@@ -7,8 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
ATTRIBUTES = ('suite:wifi_flaky, suite:wifi_matfunc,'
- 'suite:wifi_matfunc_noservo, suite:wifi_release,'
- 'subsystem:wifi')
+ 'suite:wifi_release, subsystem:wifi')
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 762dcf5..a84a779 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkHiddenWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 61c1d8c..ad376bb 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkMixedWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 2e56c87..b011468 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkNonAsciiSSID'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 cdfb3f9..14935d6 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkOddWPAPassphrases'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 1837f85..ec402b4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkRawPMK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 fbf9d81..83674bf 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkSSIDLimits'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
index ae0c78e..8cc8cec 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkTruncatedBeacon'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 fbc3f09..9c315c6 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP104'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 ea699f9..01f08c7 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 90e6c75..b6b027d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 a81bfe3..adcf58d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2_CCMP_PMF'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 36fcc3b..e0d08c0 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2_TKIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 a54c059..a0af852 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_CCMP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 c3060f1..24ee762 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_TKIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
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 73e9023..d5fced1 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
@@ -6,8 +6,7 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_multi'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo,'
- 'suite:wifi_release, subsystem:wifi')
+ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.11g b/server/site_tests/network_WiFi_SuspendStress/control.11g
index 5ec21fa..e128657 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.11g
+++ b/server/site_tests/network_WiFi_SuspendStress/control.11g
@@ -8,7 +8,7 @@
MAX_RESULT_SIZE_KB = 512000
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.24HT40 b/server/site_tests/network_WiFi_SuspendStress/control.24HT40
index af96f6d..acbc7a69 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.24HT40
+++ b/server/site_tests/network_WiFi_SuspendStress/control.24HT40
@@ -8,7 +8,7 @@
MAX_RESULT_SIZE_KB = 512000
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.5HT40 b/server/site_tests/network_WiFi_SuspendStress/control.5HT40
index ca61b3c..f882e41 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.5HT40
+++ b/server/site_tests/network_WiFi_SuspendStress/control.5HT40
@@ -8,7 +8,7 @@
MAX_RESULT_SIZE_KB = 512000
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.Hidden b/server/site_tests/network_WiFi_SuspendStress/control.Hidden
index b01db49..d6af8a9 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.Hidden
+++ b/server/site_tests/network_WiFi_SuspendStress/control.Hidden
@@ -8,7 +8,7 @@
MAX_RESULT_SIZE_KB = 512000
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.VHT80 b/server/site_tests/network_WiFi_SuspendStress/control.VHT80
index df5d25d..034463d 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.VHT80
+++ b/server/site_tests/network_WiFi_SuspendStress/control.VHT80
@@ -8,7 +8,7 @@
MAX_RESULT_SIZE_KB = 512000
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.WEP40 b/server/site_tests/network_WiFi_SuspendStress/control.WEP40
index 77653b5..8196206 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.WEP40
+++ b/server/site_tests/network_WiFi_SuspendStress/control.WEP40
@@ -8,7 +8,7 @@
MAX_RESULT_SIZE_KB = 512000
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.WPA2 b/server/site_tests/network_WiFi_SuspendStress/control.WPA2
index 8d57aac..b7f97d7 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.WPA2
+++ b/server/site_tests/network_WiFi_SuspendStress/control.WPA2
@@ -8,7 +8,7 @@
MAX_RESULT_SIZE_KB = 512000
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DOC = """
This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_TDLSPing/control b/server/site_tests/network_WiFi_TDLSPing/control
index 3155651..7460121 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_VisibleScan/control b/server/site_tests/network_WiFi_VisibleScan/control
index 8f833d4..a45398a 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'
-ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_noservo')
+ATTRIBUTES = ('suite:wifi_matfunc')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/site_utils/attribute_whitelist.txt b/site_utils/attribute_whitelist.txt
index ace52c8..efbc624 100644
--- a/site_utils/attribute_whitelist.txt
+++ b/site_utils/attribute_whitelist.txt
@@ -213,7 +213,6 @@
suite:wifi_interop_wpa2
suite:wifi_lucidsleep
suite:wifi_matfunc
-suite:wifi_matfunc_noservo
suite:wifi_perf
suite:wifi_release
suite:wifi_stress
diff --git a/test_suites/control.wifi_matfunc_noservo b/test_suites/control.wifi_matfunc_noservo
deleted file mode 100644
index d44ca4e..0000000
--- a/test_suites/control.wifi_matfunc_noservo
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 = "[email protected]"
-NAME = "wifi_matfunc_noservo"
-PURPOSE = "Clone of wifi_matfunc, excluding the tests that need servo - Verify basic WiFi functionality."
-
-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.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
