diff options
| author | Daniel A. Winkler <danielwinkler@google.com> | 2022-04-20 22:31:36 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-18 22:06:01 +0000 |
| commit | fe30017b58b07360e114cba82578fa61ef9e592b (patch) | |
| tree | 4b1bc050ffa37c07894f476175dac64bd327c981 | |
| parent | f0ab707e428ed94d772089c56ab65658df465977 (diff) | |
| download | autotest-fe30017b58b07360e114cba82578fa61ef9e592b.tar.gz | |
autotest: Ensure modem path is path-like before starting test
As part of FM350 modem teardown, the dbus object path is cleared before
it is destroyed. Test logic sees this as a new modem path prematurely.
This change checks the new path for basic path structure before
considering the modem returned.
BUG=b:229895162
TEST=Ran cellularIdentifiers test on Brya and Hatch
Change-Id: Ia42cb5f3d3949a321b794d34d29fa21abfcc72e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3598236
Commit-Queue: Daniel Winkler <danielwinkler@google.com>
Reviewed-by: Pavan Holla <pholla@google.com>
Reviewed-by: Madhav <madhavadas@google.com>
Tested-by: Daniel Winkler <danielwinkler@google.com>
| -rw-r--r-- | client/cros/networking/cellular_proxy.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/cros/networking/cellular_proxy.py b/client/cros/networking/cellular_proxy.py index 59f4a3b9db..d16ec77820 100644 --- a/client/cros/networking/cellular_proxy.py +++ b/client/cros/networking/cellular_proxy.py @@ -268,8 +268,10 @@ class CellularProxy(shill_proxy.ShillProxy): if not device: return None properties = device.GetProperties() - if (model_id == properties.get(self.DEVICE_PROPERTY_MODEL_ID) - and (mm_reboot or (old_modem_mm_object != properties.get( - self.DEVICE_PROPERTY_DBUS_OBJECT)))): + if (model_id == properties.get(self.DEVICE_PROPERTY_MODEL_ID) and + (mm_reboot or + (old_modem_mm_object != properties.get( + self.DEVICE_PROPERTY_DBUS_OBJECT) + and '/' in properties.get(self.DEVICE_PROPERTY_DBUS_OBJECT)))): return device return None |