diff options
| author | Steven Liu <steveliu@google.com> | 2023-12-12 23:59:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-12 23:59:50 +0000 |
| commit | 06627008cd49221e2bfb55aebb3f6567bc23742c (patch) | |
| tree | 4a67fc10b19f64a0e54067001c37bf7e777af2c7 | |
| parent | b79d80f0297354655ab69ce23bb58fa012103436 (diff) | |
| parent | ed4cf32462c438aa2946f759970884c03563e468 (diff) | |
| download | platform_testing-06627008cd49221e2bfb55aebb3f6567bc23742c.tar.gz | |
Avoid the missing file issue from the device. am: d91d0a37f5 am: c8cd789857 am: ed4cf32462
Original change: https://android-review.googlesource.com/c/platform/platform_testing/+/2871078
Change-Id: I4feb23853eade2a2c2c95fdaa584a85bd9c7cb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/bettertogether/quickstart/performance_test/gms_auto_updates_util.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/bettertogether/quickstart/performance_test/gms_auto_updates_util.py b/tests/bettertogether/quickstart/performance_test/gms_auto_updates_util.py index 79832fd12..f65d7d92c 100644 --- a/tests/bettertogether/quickstart/performance_test/gms_auto_updates_util.py +++ b/tests/bettertogether/quickstart/performance_test/gms_auto_updates_util.py @@ -20,6 +20,7 @@ import tempfile # from xml import etree has a problem, don't use it. from xml.etree import ElementTree from mobly.controllers import android_device +from mobly.controllers.android_device_lib import adb _FINSKY_CONFIG_FILE = '/data/data/com.android.vending/shared_prefs/finsky.xml' @@ -107,7 +108,10 @@ class GmsAutoUpdatesUtil: The path to the updated configuration file. """ path = os.path.join(tmp_dir, f'play_store_config_{name}.xml') - self._device.adb.pull([device_path, path]) + try: + self._device.adb.pull([device_path, path]) + except adb.AdbError as e: + self._device.log.warning('failed to pull %s: %s', device_path, e) config_doc = ElementTree.parse(path) if os.path.isfile(path) else None |