Bug 931078 - add ability to pass signal to dm.killProcess, r=wlach

mozilla · Oct 25, 2013 · c27774f · c27774f
1 parent 5265967
commit c27774f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/mozdevice/mozdevice/devicemanager.py b/mozdevice/mozdevice/devicemanager.py
@@ -420,10 +420,13 @@ def processExist(self, processName):
 
 
     @abstractmethod
-    def killProcess(self, processName, forceKill=False):
+    def killProcess(self, processName, sig=None):
         """
-        Kills the process named processName. If forceKill is True, process is
-        killed regardless of state.
+        Kills the process named processName. If sig is not None, process is
+        killed with the specified signal.
+
+        :param processName: path or name of the process to kill
+        :param sig: signal to pass into the kill command (optional)
         """
 
     @abstractmethod

diff --git a/mozdevice/mozdevice/devicemanagerADB.py b/mozdevice/mozdevice/devicemanagerADB.py
@@ -361,13 +361,13 @@ def launchProcess(self, cmd, outputFile = "process.txt", cwd = '', env = '', fai
         self._checkCmd(acmd)
         return outputFile
 
-    def killProcess(self, appname, forceKill=False):
+    def killProcess(self, appname, sig=None):
         procs = self.getProcessList()
         for (pid, name, user) in procs:
             if name == appname:
                 args = ["shell", "kill"]
-                if forceKill:
-                    args.append("-9")
+                if sig:
+                    args.append("-%d" % sig)
                 args.append(str(pid))
                 p = self._runCmd(args)
                 p.communicate()

diff --git a/mozdevice/mozdevice/devicemanagerSUT.py b/mozdevice/mozdevice/devicemanagerSUT.py
@@ -525,9 +525,9 @@ def launchProcess(self, cmd, outputFile = "process.txt", cwd = '', env = '', fai
             self.fireProcess(cmdline, failIfRunning)
         return outputFile
 
-    def killProcess(self, appname, forceKill=False):
-        if forceKill:
-            self._logger.warn("killProcess(): forceKill parameter unsupported on SUT")
+    def killProcess(self, appname, sig=None):
+        if sig:
+            self._logger.warn("killProcess(): sig parameter unsupported on SUT")
         retries = 0
         while retries < self.retryLimit:
             try: