Merge pull request #3419 from moizjv/fix-2353

Adding noSign capability
This commit is contained in:
Jonathan Lipps
2014-08-19 18:17:50 -04:00
3 changed files with 12 additions and 3 deletions

View File

@@ -52,6 +52,7 @@
|`optionalIntentArguments`| Additional intent arguments that will be used to start activity. See [Intent arguments](http://developer.android.com/tools/help/adb.html#IntentSpec) | e.g. `--esn <EXTRA_KEY>`, `--ez <EXTRA_KEY> <EXTRA_BOOLEAN_VALUE>`, etc.
|`unicodeKeyboard`| Enable Unicode input, default `false`| `true` or `false`|
|`resetKeyboard`| Reset keyboard to its original state, after running Unicode tests with `unicodeKeyboard` capability. Ignored if used alone. Default `false`| `true` or `false`|
|`noSign`| Skip checking and signing of app with debug keys, will work only with UiAutomator and not with selendroid, default `false`| `true` or `false`|
### iOS Only

View File

@@ -94,6 +94,7 @@ androidCommon.setAndroidArgs = function () {
this.args.appDeviceReadyTimeout = this.args.androidDeviceReadyTimeout;
this.args.avdLaunchTimeout = this.args.avdLaunchTimeout || 120000;
this.args.avdReadyTimeout = this.args.avdReadyTimeout || 120000;
this.args.noSign = this.args.noSign || false;
};
androidCommon.background = function (secs, cb) {
@@ -473,8 +474,7 @@ androidCommon.installAppForTest = function (cb) {
"of an app path");
return cb();
}
this.adb.checkAndSignApk(this.args.app, this.args.appPackage, function (err) {
var afterSigning = function (err) {
if (err) return cb(err);
this.remoteApkExists(function (err, remoteApk) {
// err is set if the remote apk doesn't exist so don't check it.
@@ -507,7 +507,14 @@ androidCommon.installAppForTest = function (cb) {
}
}.bind(this));
}.bind(this));
}.bind(this));
}.bind(this);
// Skipping sign apk for noSign true
if (this.args.noSign) {
logger.debug('noSign capability set to true, skipping checking and signing of app');
afterSigning();
} else {
this.adb.checkAndSignApk(this.args.app, this.args.appPackage, afterSigning);
}
};
androidCommon.installRemoteWithRetry = function (remoteApk, cb) {

View File

@@ -64,6 +64,7 @@ var androidCaps = [
, 'optionalIntentArguments'
, 'unicodeKeyboard'
, 'resetKeyboard'
, 'noSign'
];
var iosCaps = [