From 79ce3fe7db2a947d59218d446f356a9ab4c96800 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 18 Nov 2016 15:31:11 -0800 Subject: [PATCH] adb: be more permissive in test_push_error_reporting. Be agnostic to whether /system is writable when testing push error reporting. Test: python test_device.py Change-Id: I1d03564fa35442c20e2c96a7f5b56d39868efc52 --- adb/test_device.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adb/test_device.py b/adb/test_device.py index 02a16e458..e76aaed5c 100644 --- a/adb/test_device.py +++ b/adb/test_device.py @@ -890,7 +890,8 @@ class FileOperationsTest(DeviceTest): except subprocess.CalledProcessError as e: output = e.output - self.assertIn('Permission denied', output) + self.assertTrue('Permission denied' in output or + 'Read-only file system' in output) def _test_pull(self, remote_file, checksum): tmp_write = tempfile.NamedTemporaryFile(mode='wb', delete=False)