Chromium Code Reviews| Index: build/android/pylib/gtest/test_package_apk.py |
| diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py |
| index 9d3dac541ea580c49c464cdfca19238abc94634b..9f077b6b90f8b3047de183d5502a8e71cccd8c8a 100644 |
| --- a/build/android/pylib/gtest/test_package_apk.py |
| +++ b/build/android/pylib/gtest/test_package_apk.py |
| @@ -85,9 +85,14 @@ class TestPackageApk(TestPackage): |
| # Content shell creates a profile on the sdscard which accumulates cache |
| # files over time. |
| if self.suite_name == 'content_browsertests': |
| - device.old_interface.RunShellCommand( |
| - 'rm -r %s/content_shell' % device.old_interface.GetExternalStorage(), |
| - timeout_time=60 * 2) |
| + try: |
| + device.old_interface.RunShellCommand( |
| + 'rm -r %s/content_shell' % device.GetExternalStoragePath(), |
| + timeout_time=60 * 2) |
| + except device_errors.CommandFailedError: |
| + # TODO(jbudorick) Handle this exception appropriately once the |
| + # conversions are done. |
|
craigdh
2014/05/21 22:25:00
just fyi, I think the style guide is agnostic abou
|
| + pass |
| #override |
| def CreateCommandLineFileOnDevice(self, device, test_filter, test_arguments): |