Restrict non-US APs to static configurators.
Currently all of non-US APs are static configurators. This means
when creating an AP spec for a specialized channel, 48, if the
filter does not include the configurator type the dynamic APs will
be run a second time on the 5GHz band. This doesn't provide any
extra data and greatly increases the time of the test.
TEST=Run the two control files.
BUG=chromium:331978
Change-Id: I15537b29c1a0404f6137cd772d8a30deb1abe4c5
Reviewed-on: https://chromium-review.googlesource.com/181850
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
diff --git a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
index 295cd88..3f29a6e 100644
--- a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
+++ b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
@@ -23,10 +23,11 @@
band=ap_spec.BAND_2GHZ),
ap_spec.APSpec(security=ap_spec.SECURITY_TYPE_WPA2PSK,
band=ap_spec.BAND_5GHZ),
- # Non-US models
+ # Non-US models, which are all static
ap_spec.APSpec(security=ap_spec.SECURITY_TYPE_WPA2PSK,
band=ap_spec.BAND_5GHZ,
- channel=48)]
+ channel=48,
+ configurator_type=ap_spec.CONFIGURATOR_STATIC)]
for spec in ap_specs:
runner = chaos_runner.ChaosRunner(
'network_WiFi_ChaosConnectDisconnect', host, spec)
diff --git a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk
index 434616d..69b844f 100644
--- a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk
+++ b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk
@@ -23,10 +23,11 @@
band=ap_spec.BAND_2GHZ),
ap_spec.APSpec(security=ap_spec.SECURITY_TYPE_WPAPSK,
band=ap_spec.BAND_5GHZ),
- # Non-US models
+ # Non-US models, which are all static.
ap_spec.APSpec(security=ap_spec.SECURITY_TYPE_WPAPSK,
band=ap_spec.BAND_5GHZ,
- channel=48)]
+ channel=48,
+ configurator_type=ap_spec.CONFIGURATOR_STATIC)]
for spec in ap_specs:
runner = chaos_runner.ChaosRunner(
'network_WiFi_ChaosConnectDisconnect', host, spec)
