Bug 1000918 - Add new default device root paths used by some FxOS devices to mozdevice. r=wlach
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 24 Apr 2014 10:39:00 -0400
changeset 181113 ec6b9792a042f4124f4dd63d1c8f6ad6a32d1be1
parent 181112 6d813156e49133e6416cfd16873feec564936eb2
child 181114 2c9dd078b08cfc9e3451013ec46e46f9d88d17a1
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewerswlach
bugs1000918
milestone32.0a1
Bug 1000918 - Add new default device root paths used by some FxOS devices to mozdevice. r=wlach
testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
--- a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
@@ -452,17 +452,20 @@ class DeviceManagerADB(DeviceManager):
             if not self.dirExists(self.deviceRoot):
                 try:
                     self.mkDir(self.deviceRoot)
                 except:
                     self._logger.error("Unable to create device root %s" % self.deviceRoot)
                     raise
             return
 
-        paths = [('/mnt/sdcard', 'tests'),
+        paths = [('/storage/sdcard0', 'tests'),
+                 ('/storage/sdcard1', 'tests'),
+                 ('/sdcard', 'tests'),
+                 ('/mnt/sdcard', 'tests'),
                  ('/data/local', 'tests')]
         for (basePath, subPath) in paths:
             if self.dirExists(basePath):
                 testRoot = os.path.join(basePath, subPath)
                 try:
                     self.mkDir(testRoot)
                     self.deviceRoot = testRoot
                     return