Emulator wrapper fixes (#702)

* fix: emulator should always get non-empty command line arguments fix: detox fails to start when another emulator is running * code: changed '-gpu host' to '-gpu auto' out of compatibility concerns * code: removed double error logging, extra join and split, cleaner method chaining
wix · May 3, 2018 · 25e59e6 · 25e59e6
1 parent faf61c6
commit 25e59e6
Showing 1 changed file with 36 additions and 26 deletions.
diff --git a/detox/src/devices/android/Emulator.js b/detox/src/devices/android/Emulator.js
@@ -24,45 +24,55 @@ class Emulator {
   }
 
   async boot(emulatorName) {
-    const headless = argparse.getArgValue('headless') ? '-no-window' : '';
-    const cmd = `-verbose -gpu host -no-audio ${headless} @${emulatorName}`;
-    log.verbose(this.emulatorBin, cmd);
+    const emulatorArgs = _.compact([
+      '-verbose',
+      '-gpu', 'auto',
+      '-no-audio',
+      argparse.getArgValue('headless') ? '-no-window' : '',
+      `@${emulatorName}`
+    ]);
+
+    let childProcessOutput;
     const tempLog = `./${emulatorName}.log`;
     const stdout = fs.openSync(tempLog, 'a');
     const stderr = fs.openSync(tempLog, 'a');
-    const tail = new Tail(tempLog);
-    const promise = spawn(this.emulatorBin, _.split(cmd, ' '), {detached: true, stdio: ['ignore', stdout, stderr]});
-
-    const childProcess = promise.childProcess;
-    childProcess.unref();
-
-    tail.on("line", function(data) {
-      if (data.includes('Adb connected, start proxing data')) {
-        detach();
-      }
-      if (data.includes(`There's another emulator instance running with the current AVD`)) {
-        detach();
+    const tail = new Tail(tempLog).on("line", (line) => {
+      if (line.includes('Adb connected, start proxing data')) {
+        childProcessPromise._cpResolve();
       }
     });
 
-    tail.on("error", function(error) {
-      detach();
-      log.verbose('Emulator stderr: ', error);
-    });
+    function detach() {
+      if (childProcessOutput) {
+        return;
+      }
 
-    promise.catch(function(err) {
-      log.error('Emulator ERROR: ', err);
-    });
+      childProcessOutput = fs.readFileSync(tempLog, 'utf8');
 
-    function detach() {
       tail.unwatch();
       fs.closeSync(stdout);
       fs.closeSync(stderr);
-      fs.unlink(tempLog, () => {});
-      promise._cpResolve();
+      fs.unlink(tempLog, _.noop);
     }
 
-    return promise;
+    log.verbose(this.emulatorBin, ...emulatorArgs);
+    const childProcessPromise = spawn(this.emulatorBin, emulatorArgs, { detached: true, stdio: ['ignore', stdout, stderr] });
+    childProcessPromise.childProcess.unref();
+
+    return childProcessPromise.catch((err) => {
+      detach();
+
+      if (childProcessOutput.includes(`There's another emulator instance running with the current AVD`)) {
+        return;
+      }
+
+      log.error('ChildProcessError', '%s', err.message);
+      log.error('stderr', '%s', childProcessOutput);
+      throw err;
+    }).then(() => {
+      detach();
+      log.verbose('stdout', '%s', childProcessOutput);
+    });
   }
 }