Merge pull request #6629 from spearminty/adb-push-timeout

Add androidInstallTimeout cap, update Android dep
This commit is contained in:
Isaac A. Murchie
2016-07-01 13:12:11 -07:00
committed by GitHub
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -33,6 +33,7 @@
|`androidCoverage`| Fully qualified instrumentation class. Passed to -w in adb shell am instrument -e coverage true -w | `com.my.Pkg/com.my.Pkg.instrumentation.MyInstrumentation`|
|`enablePerformanceLogging`| (Chrome and webview only) Enable Chromedriver's performance logging (default `false`)| `true`, `false`|
|`androidDeviceReadyTimeout`|Timeout in seconds used to wait for a device to become ready after booting|e.g., `30`|
|`androidInstallTimeout`|Timeout in milliseconds used to wait for an apk to install to the device. Defaults to `90000` |e.g., `90000`|
|`adbPort`|Port used to connect to the ADB server (default `5037`)|`5037`|
|`androidDeviceSocket`|Devtools socket name. Needed only when tested app is a Chromium embedding browser. The socket is open by the browser and Chromedriver connects to it as a devtools client.|e.g., `chrome_devtools_remote`|
|`avd`| Name of avd to launch|e.g., `api19`|
+1 -1
View File
@@ -35,7 +35,7 @@
"doc": "./docs"
},
"dependencies": {
"appium-android-driver": "^1.10.6",
"appium-android-driver": "^1.10.12",
"appium-base-driver": "^2.0.3",
"appium-fake-driver": "^0.1.10",
"appium-ios-driver": "^1.12.2",