add sd card when creating avd and wait for it ready before pushing data into it

build/android/pylib/android_commands.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 
 import collections
@@ skipping 301 matching lines @@
 
     logging.info('>>> $' + install_command)
     return self._adb.SendCommand(install_command, timeout_time=2*60)
 
   def MakeSystemFolderWritable(self):
     """Remounts the /system folder rw.  """
     out = self._adb.SendCommand('remount')
     if out.strip() != 'remount succeeded':
       raise errors.MsgException('Remount failed: %s' % out)
 
+  def WaitForSdCardReady(self, timeout_time=20):

[bulach, 2012/07/12 07:39:10]

nit: please, avoid using default params... it's a real pain to maintain such
functions :)

[Wei James(wistoch), 2012/07/12 08:03:32]

fixed. thanks

+    """Wait for the SD card ready before pushing data into it"""

[bulach, 2012/07/12 07:39:10]

nit: end this sentence with a period.

[Wei James(wistoch), 2012/07/12 08:03:32]

fixed. thanks

+    logging.info("Waiting for SD card ready...")

[bulach, 2012/07/12 07:39:10]

nit: use single quotes here.

[Wei James(wistoch), 2012/07/12 08:03:32]

fixed. thanks

+    sdcard_ready = False
+    attempts = 0
+    wait_period = 5
+    while not sdcard_ready and (attempts*wait_period) < timeout_time:

[bulach, 2012/07/12 07:39:10]

nit: spaces around *, and I think the parenthesis aren't necessary..

[Wei James(wistoch), 2012/07/12 08:03:32]

fixed. thanks

+      output = self.RunShellCommand("ls /sdcard/")

[bulach, 2012/07/12 07:39:10]

nit: single quote.

[Wei James(wistoch), 2012/07/12 08:03:32]

fixed. thanks

+      if len(output) > 0:

[bulach, 2012/07/12 07:39:10]

is this condition right? I think ls nonexistingdir will output something like
"foobar: No such file or directory"..

[Wei James(wistoch), 2012/07/12 08:03:32]

ths /sdcard/ is a symbolic link to /mnt/sdcard and it is there even sd card is
not ready. 

I checked the return value of RunShellCommand('ls /sdcard/'), as RunShellCommand
will splitlines() for the result value, it will return an array of strings. if
the sdcard is not ready, it is an empty array and len() return 0. 

+        sdcard_ready = True
+      else:
+        time.sleep(wait_period)
+        attempts += 1
+    if not sdcard_ready:
+      raise errors.WaitForResponseTimedOutError(
+          "SD card not ready after %s seconds" %timeout_time)
+
   # It is tempting to turn this function into a generator, however this is not
   # possible without using a private (local) adb_shell instance (to ensure no
   # other command interleaves usage of it), which would defeat the main aim of
   # being able to reuse the adb shell instance across commands.
   def RunShellCommand(self, command, timeout_time=20, log_result=True):
     """Send a command to the adb shell and return the result.
 
     Args:
       command: String containing the shell command to send. Must not include
                the single quotes as we use them to escape the whole command.
@@ skipping 500 matching lines @@
     pid_list = self.ExtractPid(package)
     smaps = collections.defaultdict(dict)
 
     for pid in pid_list:
       usage_dict_per_pid, smaps_per_pid = self.GetMemoryUsageForPid(pid)
       smaps[pid] = smaps_per_pid
       for (key, value) in usage_dict_per_pid.items():
         usage_dict[key] += value
 
     return usage_dict, smaps