Bug 808719 - Mirror over mozdevice 0.14;r=jmaher

testing/mozbase/mozdevice/mozdevice/devicemanager.py

@@ -33,6 +33,8 @@ def abstractmethod(method):
 
 class DeviceManager:
 
+    logcatNeedsRoot = True
+
     @abstractmethod
     def shell(self, cmd, outputfile, env=None, cwd=None, timeout=None, root=False):
         """
@@ -216,13 +218,9 @@ class DeviceManager:
         """
 
     @abstractmethod
-    def getFile(self, remoteFile, localFile = ''):
+    def getFile(self, remoteFile, localFile):
         """
         Copy file from device (remoteFile) to host (localFile)
-
-        returns:
-          success: contents of file, string
-          failure: None
         """
 
     @abstractmethod
@@ -491,22 +489,24 @@ class DeviceManager:
         #TODO: spawn this off in a separate thread/process so we can collect all the logcat information
 
         # Right now this is just clearing the logcat so we can only see what happens after this call.
-        buf = StringIO.StringIO()
-        self.shell(['/system/bin/logcat', '-c'], buf, root=True)
+        self.shellCheckOutput(['/system/bin/logcat', '-c'], root=self.logcatNeedsRoot)
 
-    def getLogcat(self):
+    def getLogcat(self, filterSpecs=["dalvikvm:S", "ConnectivityService:S",
+                                      "WifiMonitor:S", "WifiStateTracker:S",
+                                      "wpa_supplicant:S", "NetworkStateTracker:S"],
+                  format="time",
+                  filterOutRegexps=[]):
         """
-        Returns the contents of the logcat file as a string
-
-        returns:
-          success: contents of logcat, string 
-          failure: None
+        Returns the contents of the logcat file as a list of strings
         """
-        buf = StringIO.StringIO()
-        if self.shell(["/system/bin/logcat", "-d", "dalvikvm:S", "ConnectivityService:S", "WifiMonitor:S", "WifiStateTracker:S", "wpa_supplicant:S", "NetworkStateTracker:S"], buf, root=True) != 0:
-            return None
+        cmdline = ["/system/bin/logcat", "-v", format, "-d"] + filterSpecs
+        lines = self.shellCheckOutput(cmdline,
+                                      root=self.logcatNeedsRoot).split('\r')
 
-        return str(buf.getvalue()[0:-1]).rstrip().split('\r')
+        for regex in filterOutRegexps:
+            lines = [line for line in lines if not re.search(regex, line)]
+
+        return lines
 
     @staticmethod
     def _writePNG(buf, width, height):

testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py

@@ -23,10 +23,12 @@ class DeviceManagerADB(DeviceManager):
         self.useRunAs = False
         self.useDDCopy = False
         self.useZip = False
+        self.logcatNeedsRoot = False
         self.packageName = None
         self.tempDir = None
         self.deviceRoot = deviceRoot
         self.default_timeout = 300
+        self.pollingInterval = 0.01
 
         # the path to adb, or 'adb' to assume that it's on the PATH
         self.adbPath = adbPath
@@ -131,7 +133,7 @@ class DeviceManagerADB(DeviceManager):
         start_time = time.time()
         ret_code = proc.poll()
         while ((time.time() - start_time) <= timeout) and ret_code == None:
-            time.sleep(1)
+            time.sleep(self.pollingInterval)
             ret_code = proc.poll()
         if ret_code == None:
             proc.kill()
@@ -271,14 +273,7 @@ class DeviceManagerADB(DeviceManager):
         Does a recursive delete of directory on the device: rm -Rf remoteDir
         """
         if (self.dirExists(remoteDir)):
-            files = self.listFiles(remoteDir.strip())
-            for f in files:
-                path = remoteDir.strip() + "/" + f.strip()
-                if self.dirExists(path):
-                    self.removeDir(path)
-                else:
-                    self.removeFile(path)
-            self._removeSingleDir(remoteDir.strip())
+            self._runCmd(["shell", "rm", "-r", remoteDir])
         else:
             self.removeFile(remoteDir.strip())
 
@@ -396,7 +391,7 @@ class DeviceManagerADB(DeviceManager):
                 args = ["shell", "kill"]
                 if forceKill:
                     args.append("-9")
-                args.append(pid)
+                args.append(str(pid))
                 p = self._runCmdAs(args)
                 p.communicate()
                 if p.returncode != 0:
@@ -450,15 +445,11 @@ class DeviceManagerADB(DeviceManager):
         os.remove(localFile)
         return ret
 
-    def getFile(self, remoteFile, localFile = 'temp.txt'):
+    def getFile(self, remoteFile, localFile):
         """
         Copy file from device (remoteFile) to host (localFile).
         """
-        contents = self.pullFile(remoteFile)
-
-        fhandle = open(localFile, 'wb')
-        fhandle.write(contents)
-        fhandle.close()
+        self._runPull(remoteFile, localFile)
 
     def getDirectory(self, remoteDir, localDir, checkDir=True):
         """
@@ -612,35 +603,6 @@ class DeviceManagerADB(DeviceManager):
             raise DMError("Unable to get current time using date (got: '%s')" % timestr)
         return str(int(timestr)*1000)
 
-    def recordLogcat(self):
-        """
-        Clears the logcat file making it easier to view specific events
-        """
-        # this does not require root privileges with ADB
-        try:
-            self.shellCheckOutput(['/system/bin/logcat', '-c'])
-        except DMError, e:
-            print "DeviceManager: Error recording logcat '%s'" % e.msg
-            # to preserve compat with parent method, just ignore exceptions
-            pass
-
-    def getLogcat(self):
-        """
-        Returns the contents of the logcat file as a string
-
-        returns:
-          success: contents of logcat, string
-          failure: None
-        """
-        # this does not require root privileges with ADB
-        try:
-            output = self.shellCheckOutput(["/system/bin/logcat", "-d", "dalvikvm:S", "ConnectivityService:S", "WifiMonitor:S", "WifiStateTracker:S", "wpa_supplicant:S", "NetworkStateTracker:S"])
-            return output.split('\r')
-        except DMError, e:
-            # to preserve compat with parent method, just ignore exceptions
-            print "DeviceManager: Error recording logcat '%s'" % e.msg
-            pass
-
     def getInfo(self, directive=None):
         """
         Returns information about the device
@@ -762,7 +724,7 @@ class DeviceManagerADB(DeviceManager):
         start_time = time.time()
         ret_code = proc.poll()
         while ((time.time() - start_time) <= timeout) and ret_code == None:
-            time.sleep(1)
+            time.sleep(self.pollingInterval)
             ret_code = proc.poll()
         if ret_code == None:
             proc.kill()

testing/mozbase/mozdevice/mozdevice/devicemanagerSUT.py

@@ -18,7 +18,6 @@ from distutils.version import StrictVersion
 
 class DeviceManagerSUT(DeviceManager):
     debug = 2
-    tempRoot = os.getcwd()
     base_prompt = '$>'
     base_prompt_re = '\$\>'
     prompt_sep = '\x00'
@@ -641,13 +640,10 @@ class DeviceManagerSUT(DeviceManager):
             return buf
         return buf[:-len(prompt)]
 
-    def getFile(self, remoteFile, localFile = ''):
+    def getFile(self, remoteFile, localFile):
         """
         Copy file from device (remoteFile) to host (localFile)
         """
-        if localFile == '':
-            localFile = os.path.join(self.tempRoot, "temp.txt")
-
         data = self.pullFile(remoteFile)
 
         fhandle = open(localFile, 'wb')

testing/mozbase/mozdevice/setup.py

@@ -5,7 +5,7 @@
 import os
 from setuptools import setup
 
-PACKAGE_VERSION = '0.12'
+PACKAGE_VERSION = '0.14'
 
 # take description from README
 here = os.path.dirname(os.path.abspath(__file__))