mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-11 20:39:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2177 from jlipps/master

Browse Source 
ensure that app is always force-stopped before uninstalling apk (fix #17...
This commit is contained in:
Jonathan Lipps
2014-03-25 14:15:05 -07:00
parent 0b4554ce4e 5c265bc459
commit d696cc862a
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/devices/android/adb.js
View File

@@ -1268,21 +1268,25 @@ ADB.prototype.waitForNotActivity = function (pkg, act, waitMs, cb) {
ADB.prototype.uninstallApk = function (pkg, cb) {
logger.info("Uninstalling " + pkg);
this.exec("uninstall " + pkg, {timeout: 20000}, function (err, stdout) {
if (err) {
logger.error(err);
cb(err);
} else {
stdout = stdout.trim();
// stdout may contain warnings meaning success is not on the first line.
if (stdout.indexOf("Success") !== -1) {
logger.debug("App was uninstalled");
this.forceStop(pkg, function (err) {
if (err) logger.info("Force-stopping before uninstall didn't work; " +
"maybe app wasn't running");
this.exec("uninstall " + pkg, {timeout: 20000}, function (err, stdout) {
if (err) {
logger.error(err);
cb(err);
} else {
logger.debug("App was not uninstalled, maybe it wasn't on device?");
stdout = stdout.trim();
// stdout may contain warnings meaning success is not on the first line.
if (stdout.indexOf("Success") !== -1) {
logger.debug("App was uninstalled");
} else {
logger.debug("App was not uninstalled, maybe it wasn't on device?");
}
cb();
}
cb();
}
});
});
}.bind(this));
};
ADB.prototype.installRemote = function (remoteApk, cb) {

7
lib/devices/android/android-common.js
View File

@@ -337,12 +337,9 @@ androidCommon.resetApp = function (cb) {
if (!remoteApk) {
return cb(new Error("Can't run reset if remote apk doesn't exist"));
}
this.adb.forceStop(this.args.appPackage, function (err) {
this.adb.uninstallApk(this.args.appPackage, function (err) {
if (err) return cb(err);
this.adb.uninstallApk(this.args.appPackage, function (err) {
if (err) return cb(err);
this.adb.installRemote(remoteApk, cb);
}.bind(this));
this.adb.installRemote(remoteApk, cb);
}.bind(this));
}.bind(this));
}