commit 62d2bea98c2a337d91f4875bcde628887b41c462
author Josh Gao <jmgao@google.com> Tue Nov 29 18:28:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 29 18:28:49 2016 +0000
tree 2981fdeb7d05111f2ba32dea0bfe8c14923c0fc3
parent 58a547b456c81bcdfd9ccb215873e9cbb560f0ce
parent 7922f2e48b913ddcea686ae860b4de460cb68557

adb: be more permissive in test_push_error_reporting. am: 79ce3fe7db am: b6e9e5ddde
am: dfeb4ae52b

Change-Id: I0d608756f56b5ebfce9e273747a9ca6aeb1969a9

adb/test_device.py

diff --git a/adb/test_device.py b/adb/test_device.py
index 02a16e4..e76aaed 100644
--- a/adb/test_device.py
+++ b/adb/test_device.py
@@ -890,7 +890,8 @@
             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)