mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-12 21:10:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1546 from jlipps/master

Browse Source 
go ahead and kill sims before launching a new one
This commit is contained in:
bootstraponline
2013-11-27 06:47:32 -08:00
parent 6eeea18fcb 1428a81884
commit d877639ba5
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/devices/ios/ios.js
View File

@@ -632,14 +632,17 @@ IOS.prototype.setDeviceAndLaunchSimulator = function(cb) {
cb(new Error(msg));
} else {
var iosDeviceString = this.getDeviceString();
var isiPhone = iosDeviceString.toLowerCase().indexOf("ipad") === -1;
this.endSimulator(function(err) {
if (err) return cb(err);
var iosDeviceString = this.getDeviceString();
var isiPhone = iosDeviceString.toLowerCase().indexOf("ipad") === -1;
logger.debug("Launching device: " + iosDeviceString);
var iosSimArgs = ["-SimulateDevice", iosDeviceString];
this.iosSimProcess = spawn(iosSimPath, iosSimArgs);
logger.debug("Launching device: " + iosDeviceString);
var iosSimArgs = ["-SimulateDevice", iosDeviceString];
this.iosSimProcess = spawn(iosSimPath, iosSimArgs);
this.setDeviceTypeInInfoPlist(isiPhone ? 1 : 2, cb);
this.setDeviceTypeInInfoPlist(isiPhone ? 1 : 2, cb);
}.bind(this));
}
}
};
@@ -763,7 +766,11 @@ IOS.prototype.endSimulator = function(cb) {
} else {
var cmd = 'killall -9 "iPhone Simulator"';
exec(cmd, { maxBuffer: 524288 }, function(err) {
cb(err);
if (err && err.message.indexOf('matching processes') === -1) {
cb(err);
} else {
cb();
}
});
}
};