Allow RunShellCommand to work even with very large commands

build/android/pylib/utils/device_temp_file.py

Index: build/android/pylib/utils/device_temp_file.py
diff --git a/build/android/pylib/utils/device_temp_file.py b/build/android/pylib/utils/device_temp_file.py
index 2a9b45101803e18f2ca8046a25e8bb126e5624b4..ba95395d8b525d320c1172844ca5bce44b700e99 100644
--- a/build/android/pylib/utils/device_temp_file.py
+++ b/build/android/pylib/utils/device_temp_file.py
@@ -9,34 +9,42 @@
 import random
 import time
 
+from pylib import cmd_helper
+from pylib.device import device_errors
+
+
 class DeviceTempFile(object):
-  def __init__(self, device, prefix='temp_file', suffix=''):
+  def __init__(self, adb, prefix='temp_file', suffix=''):
     """Find an unused temporary file path in the devices external directory.
 
     When this object is closed, the file will be deleted on the device.
 
     Args:
-      device: An instance of DeviceUtils
+      adb: An instance of AdbWrapper
       prefix: The prefix of the name of the temp file.
       suffix: The suffix of the name of the temp file.
     """
-    self._device = device
+    self._adb = adb
+    external_storage = self._adb.Shell('echo $EXTERNAL_STORAGE').rstrip()
+    # make sure that external storage is readable
+    self._adb.Shell('test -d %s' % external_storage)
     while True:
-      i = random.randint(0, 1000000)
-      self.name = '%s/%s-%d-%010d%s' % (
-          self._device.GetExternalStoragePath(),
-          prefix, int(time.time()), i, suffix)
-      if not self._device.FileExists(self.name):
-        break
-    # Immediately create an empty file so that other temp files can't
-    # be given the same name.
-    # |as_root| must be set to False due to the implementation of |WriteFile|.
-    # Having |as_root| be True may cause infinite recursion.
-    self._device.WriteFile(self.name, '', as_root=False)
+      self.name = '{path}/{prefix}-{time:d}-{nonce:d}{suffix}'.format(

[jbudorick, 2014/11/27 17:17:34]

Unrelated meddling again, I see. :)

[perezju, 2014/11/28 15:39:34]

ahhh, but it looks nicer, no? :)

[jbudorick, 2014/11/28 18:49:01]

Yes, but I would prefer if we kept unrelated meddling to a minimum.

+        path=external_storage, prefix=prefix, time=int(time.time()),
+        nonce=random.randint(0, 1000000), suffix=suffix)
+      self.name_quoted = cmd_helper.SingleQuote(self.name)
+      try:
+        self._adb.Shell('test -e %s' % self.name_quoted)
+      except device_errors.AdbCommandFailedError:
+        break # file does not exist
+
+    # Immediately touch the file, so other temp files can't get the same name.
+    self._adb.Shell('touch %s' % self.name_quoted)

[jbudorick, 2014/11/27 17:17:34]

Does touching have the same effect?

[perezju, 2014/11/28 15:39:34]

yep, creates a file of 0 bytes if it didn't exist already. I also tested it on a
device.

[jbudorick, 2014/11/28 18:49:01]

sgtm

 
   def close(self):
     """Deletes the temporary file from the device."""
-    self._device.RunShellCommand(['rm', self.name])
+    # we use -f to ignore errors if the file is already gone
+    self._adb.Shell('rm -f %s' % self.name_quoted)
 
   def __enter__(self):
     return self