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

Merge pull request #2654 from bootstraponline/uninstall_fix

Browse Source 
uninstall before install
This commit is contained in:
Jonah
2014-05-23 12:03:49 -07:00
parent b388d401f1 ce6b4f0867
commit e23d64aba9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -460,12 +460,12 @@ androidCommon.installApp = function (cb) {
};
androidCommon.installRemoteWithRetry = function (remoteApk, cb) {
this.adb.installRemote(remoteApk, function (err) {
if (err) {
logger.warn("Installing remote apk failed, going to uninstall and try " +
"again");
this.adb.uninstallApk(this.args.appPackage, function (err) {
if (err) logger.warn("Uninstalling apk failed, continuing");
this.adb.uninstallApk(this.args.appPackage, function (err) {
if (err) logger.warn("Uninstalling apk failed, continuing");
this.adb.installRemote(remoteApk, function (err) {
if (err) {
logger.warn("Installing remote apk failed, going to uninstall and try " +
"again");
this.removeTempApks([], function () {
this.adb.push(this.args.app, remoteApk, function (err) {
if (err) return cb(err);
@@ -473,10 +473,10 @@ androidCommon.installRemoteWithRetry = function (remoteApk, cb) {
this.adb.installRemote(remoteApk, cb);
}.bind(this));
}.bind(this));
}.bind(this));
} else {
cb();
}
} else {
cb();
}
}.bind(this));
}.bind(this));
};