github/cordova-android
github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-04-03 05:11:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: wait_for_boot waiting forever (#978)

Browse Source
This commit is contained in:
Norman Breau 2020-05-22 15:07:18 -03:00 committed by GitHub
parent 08dc1dd9b9
commit a830145f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/templates/cordova/lib/emulator.js vendored
View File

@ -352,8 +352,8 @@ module.exports.wait_for_emulator = function (port) {
*/ */
module.exports.wait_for_boot = function (emulator_id, time_remaining) { module.exports.wait_for_boot = function (emulator_id, time_remaining) {
var self = this; var self = this;
return Adb.shell(emulator_id, 'ps').then(function (output) { return Adb.shell(emulator_id, 'getprop sys.boot_completed').then(function (output) {
if (output.match(/android\.process\.acore/)) { if (output.match(/1/)) {
return true; return true;
} else if (time_remaining === 0) { } else if (time_remaining === 0) {
return false; return false;

2
spec/unit/emulator.spec.js
View File

@ -452,7 +452,7 @@ describe('emulator', () => {
it('should resolve with true if the system has booted', () => { it('should resolve with true if the system has booted', () => {
AdbSpy.shell.and.callFake((emuId, shellArgs) => { AdbSpy.shell.and.callFake((emuId, shellArgs) => {
expect(emuId).toBe(emulatorId); expect(emuId).toBe(emulatorId);
expect(shellArgs).toContain('ps'); expect(shellArgs).toContain('getprop sys.boot_completed');
return Promise.resolve(psOutput); return Promise.resolve(psOutput);
}); });