Merge pull request #961 from uchida/kill-orphaned-processes

kill orphaned processes after test has finished

Author: lukeis

selendroid-standalone/src/main/java/io/selendroid/standalone/android/impl/AbstractDevice.java

@@ -201,6 +201,7 @@ public void kill(AndroidApp aut) throws AndroidDeviceException, AndroidSdkExcept
       CommandLine command = adbCommand("shell", "am", "force-stop", aut.getBasePackage());
       executeCommandQuietly(command);
     } finally {
+      killProcesses(aut.getBasePackage());
       freeSelendroidPort();
     }
 
@@ -210,6 +211,25 @@ public void kill(AndroidApp aut) throws AndroidDeviceException, AndroidSdkExcept
     }
   }
 
+  private void killProcesses(String packageName) {
+    CommandLine command = adbCommand("shell", "ps");
+    String processes = "";
+    try {
+      processes = ShellCommand.exec(command);
+    } catch (ShellCommandException e) {
+      String logMessage = String.format("Could not execute command: %s", command);
+      log.log(Level.WARNING, logMessage, e);
+    }
+
+    for (String process: processes.split("\\r\\n|\\r|\\n")) {
+      if (process.endsWith(packageName)) {
+        String pid = process.split("\\s+")[1];
+        command = adbCommand("shell", "run-as", packageName, "kill", pid);
+        executeCommandQuietly(command);
+      }
+    }
+  }
+
   private void freeSelendroidPort() {
     if (this.port == null) {
       // Not set