Change test ordering in OTA sensitivity tests.
This CL changes the test case ordering in Wifi Sensitivity tests to save
time by only reconfiguring the chain mask twice in a per chain test
suite.
Test: Done
Bug: None
Change-Id: I6545514cfdfc4d124bb76590cc8f451b176fc7d4
Signed-off-by: Omar El Ayach <oelayach@google.com>
diff --git a/acts/tests/google/wifi/WifiSensitivityTest.py b/acts/tests/google/wifi/WifiSensitivityTest.py
index 37fa160..800ac5b 100644
--- a/acts/tests/google/wifi/WifiSensitivityTest.py
+++ b/acts/tests/google/wifi/WifiSensitivityTest.py
@@ -817,7 +817,7 @@
mode for mode in modes
if mode in self.VALID_TEST_CONFIGS[channel]
]
- for mode in requested_modes:
+ for chain, mode in itertools.product(chain_mask, requested_modes):
if 'VHT' in mode:
valid_rates = self.VALID_RATES[mode]
elif 'HT' in mode:
@@ -828,8 +828,7 @@
valid_rates = self.VALID_RATES['legacy_5GHz']
else:
raise ValueError('Invalid test mode.')
- for chain, rate, angle in itertools.product(
- chain_mask, valid_rates, angles):
+ for rate, angle in itertools.product(valid_rates, angles):
testcase_params = collections.OrderedDict(
channel=channel,
mode=mode,