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 #1865 from bootstraponline/master

Browse Source 
Fix async fullReset on Android
This commit is contained in:
bootstraponline
2014-02-04 11:25:53 -08:00
parent 44e5e142ae 4d7d0533d3
commit bb70d6410b
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/server-args.md
View File

@@ -19,7 +19,7 @@ All flags are optional, but some are required in conjunction with certain others
|`-k`, `--keep-artifacts`|false|(IOS-only) Keep Instruments trace directories||
|`-r`, `--backend-retries`|3|(iOS-only) How many times to retry launching Instruments before saying it crashed or timed out|`--backend-retries 3`|
|`--session-override`|false|Enables session override (clobbering)||
|`--full-reset`|false|(iOS) Delete the entire simulator folder. (Android) Reset app state by uninstalling app instead of clearing app data||
|`--full-reset`|false|(iOS) Delete the entire simulator folder. (Android) Reset app state by uninstalling app instead of clearing app data. On Android, this will also remove the app after the session is complete.||
|`--no-reset`|false|Don't reset app state between sessions (IOS: don't delete app plist files; Android: don't uninstall app before new session)||
|`-l`, `--pre-launch`|false|Pre-launch the application before allowing the first session (Requires --app and, for Android, --app-pkg and --app-activity)||
|`-lt`, `--launch-timeout`|90000|(iOS-only) how long in ms to wait for Instruments to launch||
@@ -49,7 +49,7 @@ All flags are optional, but some are required in conjunction with certain others
|`-ra`, `--robot-address`|0.0.0.0|IP Address of robot|`--robot-address 0.0.0.0`|
|`-rp`, `--robot-port`|-1|port for robot|`--robot-port 4242`|
|`--selendroid-port`|8080|Local port used for communication with Selendroid|`--selendroid-port 8080`|
|`--chromedriver-port`|9515|(Android-only) Local port used for running ChromeDriver|`--chromedriver-port 9515`|
|`--chromedriver-port`|9515|Port upon which ChromeDriver will run|`--chromedriver-port 9515`|
|`--use-keystore`|false|(Android-only) When set the keystore will be used to sign apks.||
|`--keystore-path`|/Users/user/.android/debug.keystore|(Android-only) Path to keystore||
|`--keystore-password`|android|(Android-only) Password to keystore||

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

@@ -319,6 +319,16 @@ Android.prototype.requestXmlCompression = function (cb) {
Android.prototype.stop = function (cb) {
this.shuttingDown = true;
var completeShutdown = function (cb) {
if (this.adb) {
this.adb.goToHome(function () {
this.shutdown(cb);
}.bind(this));
} else {
this.shutdown(cb);
}
}.bind(this);
if (this.opts.fullReset) {
logger.info("Removing app from device");
this.uninstallApp(function (err) {
@@ -327,16 +337,13 @@ Android.prototype.stop = function (cb) {
// process
logger.warn(err);
}
completeShutdown(cb);
});
} else {
completeShutdown(cb);
}
if (this.adb) {
this.adb.goToHome(function () {
this.shutdown(cb);
}.bind(this));
} else {
this.shutdown(cb);
}
};
Android.prototype.cleanup = function () {

16
lib/devices/android/selendroid.js
View File

@@ -169,6 +169,14 @@ Selendroid.prototype.checkSelendroidCerts = function (cb) {
};
Selendroid.prototype.stop = function (cb) {
var completeShutdown = function (cb) {
logger.info("Stopping selendroid server");
this.deleteSession(function (err) {
cb(err ? 1 : 0);
});
}.bind(this);
if (this.opts.fullReset) {
logger.info("Removing app from device");
this.uninstallApp(function (err) {
@@ -177,13 +185,13 @@ Selendroid.prototype.stop = function (cb) {
// process
logger.warn(err);
}
completeShutdown(cb);
});
} else {
completeShutdown(cb);
}
logger.info("Stopping selendroid server");
this.deleteSession(function (err) {
cb(err ? 1 : 0);
});
};
Selendroid.prototype.keyevent = function (keycode, metastate, cb) {