From 28ce1f0b90d99f6e7f2a015045507afaa65d4140 Mon Sep 17 00:00:00 2001 From: joaogranado Date: Fri, 6 Jan 2017 13:09:08 +0000 Subject: [PATCH] Update regular expression to get device id --- android.js | 2 +- spec/android-start-or-create-spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android.js b/android.js index 71e9cd1..5c8ae4d 100644 --- a/android.js +++ b/android.js @@ -93,7 +93,7 @@ var Android = { verbose('start(' + avdName + ')'); return spawnWaitFor( 'emulator -verbose -avd "' + avdName + '"', - /emulator: control console listening on port (\d+), ADB on port \d+/ + /emulator: Serial number of this emulator \(for ADB\): emulator-(\d+)/ ).then(function(result) { return { process: result.process, diff --git a/spec/android-start-or-create-spec.js b/spec/android-start-or-create-spec.js index 6518e13..fc7a0df 100644 --- a/spec/android-start-or-create-spec.js +++ b/spec/android-start-or-create-spec.js @@ -15,10 +15,10 @@ describe('Android', function() { var obj = { process: fakeProcess = {}, matches: [ - 'emulator: control console listening on port (5554), ADB on port 5555', + 'emulator: Serial number of this emulator (for ADB): emulator-5554', '5554', ], - line: 'emulator: control console listening on port (5554), ADB on port 5555', + line: 'emulator: Serial number of this emulator (for ADB): emulator-5554', }; return bluebird.resolve(obj);