network_WiFi_SuspendStress: don't put long tests in 'wifi_matfunc_noservo'

These tests weren't in wifi_matfunc in the first place, so they probably
don't need to be in suite:wifi_matfunc_noservo. And they run over 600
cycles which can take many hours.

Leave them in wifi_stress.

BUG=none
TEST=run suite:wifi_matfunc_noservo

Change-Id: I285ce9ea67d5bb9af24335270149f216c7d384b2
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/540266
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.stress_24HT40 b/server/site_tests/network_WiFi_SuspendStress/control.stress_24HT40
index a9183a5..ce9c94e 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.stress_24HT40
+++ b/server/site_tests/network_WiFi_SuspendStress/control.stress_24HT40
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 DEPENDENCIES = 'wificell'
-ATTRIBUTES = 'suite:wifi_stress, suite:wifi_matfunc_noservo'
+ATTRIBUTES = 'suite:wifi_stress'
 
 DOC = """
 This test uses powerd_dbus to suspend and resume and checks that the
diff --git a/server/site_tests/network_WiFi_SuspendStress/control.stress_WPA2 b/server/site_tests/network_WiFi_SuspendStress/control.stress_WPA2
index 3687d4d..5421d8c 100644
--- a/server/site_tests/network_WiFi_SuspendStress/control.stress_WPA2
+++ b/server/site_tests/network_WiFi_SuspendStress/control.stress_WPA2
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 DEPENDENCIES = 'wificell'
-ATTRIBUTES = 'suite:wifi_stress, suite:wifi_matfunc_noservo'
+ATTRIBUTES = 'suite:wifi_stress'
 
 DOC = """
 This test uses powerd_dbus to suspend and resume and checks that the