No emulator.boot()

Author: d4vidi

detox/package.json

@@ -91,7 +91,7 @@
       "MissingDetox.js",
       "EmulatorTelnet.js",
       "EmulatorExec.js",
-      "Emulator.js",
+      "EmulatorLauncher.js",
       "DeviceDriverBase.js",
       "GREYConfiguration.js",
       "src/utils/environment.js",

detox/src/devices/drivers/android/EmulatorDriver.js

@@ -5,8 +5,8 @@ const ini = require('ini');
 const AndroidDriver = require('./AndroidDriver');
 const FreeEmulatorFinder = require('./emulator/FreeEmulatorFinder');
 const AVDValidator = require('./emulator/AVDValidator');
+const EmulatorLauncher = require('./emulator/EmulatorLauncher');
 const { EmulatorExec } = require('./tools/EmulatorExec');
-const Emulator = require('./tools/Emulator');
 const EmulatorTelnet = require('./tools/EmulatorTelnet');
 const EmulatorVersionResolver = require('./emulator/EmulatorVersionResolver');
 const DetoxRuntimeError = require('../../../errors/DetoxRuntimeError');
@@ -27,13 +27,15 @@ class EmulatorDriver extends AndroidDriver {
   constructor(config) {
     super(config);
 
-    this._emulatorExec = new EmulatorExec();
-    this.emulator = new Emulator(this._emulatorExec);
     this.deviceRegistry = new DeviceRegistry({
       lockfilePath: environment.getDeviceLockFilePathAndroid(),
     });
-    this._emuVersionResolver = new EmulatorVersionResolver(this._emulatorExec);
-    this._avdValidator = new AVDValidator(this._emulatorExec);
+
+    const emulatorExec = new EmulatorExec();
+    this._emuVersionResolver = new EmulatorVersionResolver(emulatorExec);
+    this._emuLauncher = new EmulatorLauncher(emulatorExec);
+    this._avdValidator = new AVDValidator(emulatorExec);
+
     this.pendingBoots = {};
     this._name = 'Unspecified Emulator';
   }
@@ -73,7 +75,7 @@ class EmulatorDriver extends AndroidDriver {
 
     if (coldBoot) {
       const port = this.pendingBoots[adbName];
-      await this.emulator.boot(avdName, {port});
+      await this._emuLauncher.launch(avdName, { port });
       delete this.pendingBoots[adbName];
     }
 
@@ -133,8 +135,8 @@ class EmulatorDriver extends AndroidDriver {
   }
 
   async _doAllocateDevice(avdName) {
-    const FreeEmulatorFinder = new FreeEmulatorFinder(this.adb, this.deviceRegistry, avdName);
-    const freeEmulatorAdbName = await FreeEmulatorFinder.findFreeDevice();
+    const freeEmulatorFinder = new FreeEmulatorFinder(this.adb, this.deviceRegistry, avdName);
+    const freeEmulatorAdbName = await freeEmulatorFinder.findFreeDevice();
     return freeEmulatorAdbName || this._createDevice();
   }
 

detox/src/devices/drivers/android/tools/Emulator.js renamed to detox/src/devices/drivers/android/emulator/EmulatorLauncher.js

@@ -1,20 +1,18 @@
 const _ = require('lodash');
 const fs = require('fs');
 const Tail = require('tail').Tail;
+const { LaunchCommand } = require('../tools/EmulatorExec');
 const unitLogger = require('../../../../utils/logger').child({ __filename });
 const retry = require('../../../../utils/retry');
-const {
-  LaunchCommand,
-} = require('./EmulatorExec');
 
 const isUnknownEmulatorError = (err) => (err.message || '').includes('failed with code null');
 
-class Emulator {
+class EmulatorLauncher {
   constructor(emulatorExec) {
-    this.emulatorExec = emulatorExec;
+    this._emulatorExec = emulatorExec;
   }
 
-  async boot(emulatorName, options = {port: undefined}) {
+  async launch(emulatorName, options = {port: undefined}) {
     const launchCommand = new LaunchCommand(emulatorName, options);
 
     return await retry({
@@ -57,8 +55,8 @@ class Emulator {
     }
 
     let log = unitLogger.child({ fn: 'boot' });
-    log.debug({ event: 'SPAWN_CMD' }, this.emulatorExec.toString(), launchCommand.toString());
-    const childProcessPromise = this.emulatorExec.spawn(launchCommand, stdout, stderr);
+    log.debug({ event: 'SPAWN_CMD' }, this._emulatorExec.toString(), launchCommand.toString());
+    const childProcessPromise = this._emulatorExec.spawn(launchCommand, stdout, stderr);
     childProcessPromise.childProcess.unref();
     log = log.child({ child_pid: childProcessPromise.childProcess.pid });
 
@@ -80,4 +78,4 @@ class Emulator {
   }
 }
 
-module.exports = Emulator;
+module.exports = EmulatorLauncher;

detox/src/devices/drivers/android/emulator/FreeEmulatorFinder.js

@@ -1,5 +1,5 @@
-const log = require('../../../../utils/logger').child({ __filename });
 const AdbDevicesHelper = require('../tools/AdbDevicesHelper');
+const log = require('../../../../utils/logger').child({ __filename });
 
 const ACQUIRE_DEVICE_EV = 'ACQUIRE_DEVICE';
 
@@ -32,4 +32,5 @@ class FreeEmulatorFinder {
     return false;
   }
 }
+
 module.exports = FreeEmulatorFinder;