autotest: enable modem reset for FM350
Modem reset was temporarily disabled as the feature was not available in
the lab. Now that it is deployed, re-enable the logic before tests
start.
BUG=b:191089189
TEST=cellular_Identifiers test on Brya
Change-Id: I2ce238fe0b9deacc46c0a72a7cd641e9e4ad9dc7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3598237
Reviewed-by: Pavan Holla <pholla@google.com>
Tested-by: Daniel Winkler <danielwinkler@google.com>
Commit-Queue: Daniel Winkler <danielwinkler@google.com>
diff --git a/client/cros/cellular/test_environment.py b/client/cros/cellular/test_environment.py
index b60515a..c6de8ba 100644
--- a/client/cros/cellular/test_environment.py
+++ b/client/cros/cellular/test_environment.py
@@ -278,27 +278,12 @@
self._system_service_order = self._get_service_order()
self._set_service_order(self._test_service_order)
- def _modem_should_skip_reset(self):
- # b/191089189 - FM350 reset is flaky and blocks all autotests.
- SKIP_RESET_DEVICE_IDS = ['pci:14c3']
- modem_device = self._get_shill_cellular_device_object()
- modem_device_id = modem_device.GetProperties()['Cellular.DeviceID']
-
- for dev_id in SKIP_RESET_DEVICE_IDS:
- if dev_id in modem_device_id:
- logging.info(
- 'Skipping reset on incompatible device ID {}'.format(
- modem_device_id))
- return True
-
- return False
-
def _initialize_modem_components(self):
"""Reset the modem and get access to modem components."""
# Enable modem first so shill initializes the modemmanager proxies so
# we can call reset on it.
self._enable_modem()
- if not self._skip_modem_reset and not self._modem_should_skip_reset():
+ if not self._skip_modem_reset:
self._reset_modem()
# PickOneModem() makes sure there's a modem manager and that there is
