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

Merge pull request #2048 from bootstraponline/ios_mercy

Browse Source 
Default to mercy on iOS
This commit is contained in:
Jonathan Lipps
2014-03-12 10:01:39 -07:00
parent 4784ed7558 19b8fc4b10
commit ec46e59c28
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/server-args.md
View File

@@ -29,7 +29,8 @@ All flags are optional, but some are required in conjunction with certain others
|`--log-no-colors`|false|Don't use colors in console output||
|`-G`, `--webhook`|null|Also send log output to this HTTP listener|`--webhook localhost:9876`|
|`--native-instruments-lib`|false|(IOS-only) IOS has a weird built-in unavoidable delay. We patch this in appium. If you do not want it patched, pass in this flag.||
|`--merciful`, `-m`|false|Don't run the watcher process that will force-kill an unresponsive instruments||
|`--merciful`, `-m`|true|[DEPRECATED] Don't run the watcher process that will force-kill an unresponsive instruments||
|`--not-merciful`, `-nm`|false|Run the watcher process that will force-kill an unresponsive instruments||
|`--app-pkg`|null|(Android-only) Java package of the Android app you want to run (e.g., com.example.android.myApp)|`--app-pkg com.example.android.myApp`|
|`--app-activity`|null|(Android-only) Activity name for the Android activity you want to launch from your package (e.g., MainActivity)|`--app-activity MainActivity`|
|`--app-wait-package`|false|(Android-only) Package name for the Android activity you want to wait for (e.g., com.example.android.myApp)|`--app-wait-package com.example.android.myApp`|
@@ -54,7 +55,7 @@ All flags are optional, but some are required in conjunction with certain others
|`--selendroid-port`|8080|Local port used for communication with Selendroid|`--selendroid-port 8080`|
|`--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/jlipps/.android/debug.keystore|(Android-only) Path to keystore||
|`--keystore-path`|/Users/user/.android/debug.keystore|(Android-only) Path to keystore||
|`--keystore-password`|android|(Android-only) Password to keystore||
|`--key-alias`|androiddebugkey|(Android-only) Key alias||
|`--key-password`|android|(Android-only) Key password||

14
lib/server/parser.js
View File

@@ -184,11 +184,21 @@ var args = [
}],
[['--merciful', '-m'], {
defaultValue: false
defaultValue: true
, dest: 'merciful'
, action: 'storeTrue'
, required: false
, help: "Don't run the watcher process that will force-kill an " +
, help: "[DEPRECATED] Don't run the watcher process that will force-kill an " +
"unresponsive instruments"
, nargs: 0
}],
[['--not-merciful', '-nm'], {
defaultValue: false
, dest: 'merciful'
, action: 'storeFalse'
, required: false
, help: "Run the watcher process that will force-kill an " +
"unresponsive instruments"
, nargs: 0
}],