Make killEmulator method work for current emu

appium · Jun 26, 2018 · 7271ff7 · 7271ff7
1 parent 90354b5
commit 7271ff7
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/lib/tools/system-calls.js b/lib/tools/system-calls.js
@@ -1,7 +1,7 @@
 import path from 'path';
 import log from '../logger.js';
 import B from 'bluebird';
-import { system, fs } from 'appium-support';
+import { system, fs, util } from 'appium-support';
 import { getSdkToolsVersion, getBuildToolsDirs } from '../helpers';
 import { exec, SubProcess } from 'teen_process';
 import { sleep, retry, retryInterval } from 'asyncbox';
@@ -546,13 +546,20 @@ systemCallMethods.killAllEmulators = async function () {
  * @param {string} avdName - The name of the emulator to be killed.
  */
 systemCallMethods.killEmulator = async function (avdName) {
-  log.debug(`killing avd '${avdName}'`);
-  let device = await this.getRunningAVD(avdName);
-  if (device) {
-    await this.adbExec(['emu', 'kill']);
-    log.info(`successfully killed emulator '${avdName}'`);
+  if (util.hasValue(avdName)) {
+    log.debug(`killing avd '${avdName}'`);
+    let device = await this.getRunningAVD(avdName);
+    if (device) {
+      await this.adbExec(['emu', 'kill']);
+      log.info(`successfully killed emulator '${avdName}'`);
+    } else {
+      log.info(`no avd with name '${avdName}' running. skipping kill step.`);
+    }
   } else {
-    log.info(`no avd with name '${avdName}' running. skipping kill step.`);
+    // killing the current avd
+    log.debug(`killing avd with id '${this.curDeviceId}'`);
+    await this.adbExec(['emu', 'kill']);
+    log.info(`successfully killed emulator`);
   }
 };