Merge pull request appium#178 from appium/isaac-ps

Use all processes when looking for pids
trantrungtin · Oct 7, 2016 · f41dea7 · f41dea7
2 parents 88b85eb + 4bc9dbf
commit f41dea7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/lib/tools/adb-commands.js b/lib/tools/adb-commands.js
@@ -424,16 +424,7 @@ methods.getPIDsByName = async function (name) {
     if (name.length > 15) {
       name = name.substr(name.length - 15);
     }
-    let stdout;
-    try {
-      stdout = await this.shell(["ps", name]);
-    } catch (err) {
-      // on some systems `name` is not accepted
-      // so get **all** the processes and skip wrong ones below
-      log.debug(`Unable to get process for '${name}'. Retrieving all processes.`);
-      stdout = await this.shell(["ps"]);
-    }
-    stdout = stdout.trim();
+    let stdout = await this.shell(["ps"]).trim();
     let pids = [];
     for (let line of stdout.split("\n")) {
       if (line.indexOf(name) !== -1) {

diff --git a/test/unit/adb-commands-specs.js b/test/unit/adb-commands-specs.js
@@ -484,7 +484,7 @@ describe('adb commands', () => {
     describe('getPIDsByName', withMocks({adb}, (mocks) => {
       it('should call shell and parse pids correctly', async () => {
         mocks.adb.expects("shell")
-          .once().withExactArgs(['ps', '.contactmanager'])
+          .once().withExactArgs(['ps'])
           .returns(psOutput);
         (await adb.getPIDsByName(contactManagerPackage))[0].should.equal(5078);
         mocks.adb.verify();