From e58c60798760fc85762ede0aea8934e9a753a3b2 Mon Sep 17 00:00:00 2001
From: William Lachance <wlach@mozilla.com>
Date: Tue, 8 May 2012 10:23:19 -0400
Subject: [PATCH] Bug 752670 - Takes forever to initialize devicemanagerADB if
 deviceRoot has many files in it; r=jmaher

---
 build/mobile/devicemanagerADB.py | 44 ++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/build/mobile/devicemanagerADB.py b/build/mobile/devicemanagerADB.py
index d93846f8557..4619bc2daa3 100644
--- a/build/mobile/devicemanagerADB.py
+++ b/build/mobile/devicemanagerADB.py
@@ -24,6 +24,7 @@ class DeviceManagerADB(DeviceManager):
     self.useZip = False
     self.packageName = None
     self.tempDir = None
+    self.deviceRoot = None
 
     # the path to adb, or 'adb' to assume that it's on the PATH
     self.adbPath = adbPath
@@ -50,6 +51,9 @@ class DeviceManagerADB(DeviceManager):
     # verify that we can connect to the device. can't continue
     self.verifyDevice()
 
+    # set up device root
+    self.setupDeviceRoot()
+
     # Can we use run-as? (currently not required)
     try:
       self.verifyRunAs()
@@ -171,6 +175,9 @@ class DeviceManagerADB(DeviceManager):
       result = self.runCmdAs(["shell", "mkdir", name]).stdout.read()
       if 'read-only file system' in result.lower():
         return None
+      if 'file exists' in result.lower():
+        return name
+
       self.chmodDir(name)
       return name
     except:
@@ -525,6 +532,26 @@ class DeviceManagerADB(DeviceManager):
     data = p = subprocess.Popen(["ls", "-l", filename], stdout=subprocess.PIPE).stdout.read()
     return data.split()[4]
 
+  # Internal method to setup the device root and cache its value
+  def setupDeviceRoot(self):
+    # /mnt/sdcard/tests is preferred to /data/local/tests, but this can be
+    # over-ridden by creating /data/local/tests
+    testRoot = "/data/local/tests"
+    if (self.dirExists(testRoot)):
+      self.deviceRoot = testRoot
+      return
+
+    for (basePath, subPath) in [('/mnt/sdcard', 'tests'),
+                                ('/data/local', 'tests')]:
+      if self.dirExists(basePath):
+        testRoot = os.path.join(basePath, subPath)
+        if self.mkDir(testRoot):
+          self.deviceRoot = testRoot
+          return
+
+    raise DMError("Unable to set up device root as /mnt/sdcard/tests "
+                  "or /data/local/tests")
+
   # Gets the device root for the testing area on the device
   # For all devices we will use / type slashes and depend on the device-agent
   # to sort those out.  The agent will return us the device location where we
@@ -543,22 +570,7 @@ class DeviceManagerADB(DeviceManager):
   #  success: path for device root
   #  failure: None
   def getDeviceRoot(self):
-    # /mnt/sdcard/tests is preferred to /data/local/tests, but this can be
-    # over-ridden by creating /data/local/tests
-    testRoot = "/data/local/tests"
-    if (self.dirExists(testRoot)):
-      return testRoot
-
-    root = "/mnt/sdcard"
-    if self.dirExists(root):
-      testRoot = root + "/tests"
-      if self.mkDir(testRoot):
-        return testRoot
-
-    testRoot = "/data/local/tests"
-    if (not self.dirExists(testRoot)):
-      self.mkDir(testRoot)
-    return testRoot
+    return self.deviceRoot
 
   # Gets the temporary directory we are using on this device
   # base on our device root, ensuring also that it exists.