Merge a8c152f into 803444d

appium · Sep 24, 2018 · 8453f4a · 8453f4a
2 parents 803444d + a8c152f
commit 8453f4a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/android-helpers.js b/lib/android-helpers.js
@@ -64,6 +64,11 @@ helpers.createBaseADB = async function (opts = {}) {
     remoteAdbHost,
     clearDeviceLogsOnStart,
     adbExecTimeout,
+    useKeystore,
+    keystorePath,
+    keystorePassword,
+    keyAlias,
+    keyPassword,
   } = opts;
   return await ADB.createADB({
     javaVersion,
@@ -72,6 +77,11 @@ helpers.createBaseADB = async function (opts = {}) {
     remoteAdbHost,
     clearDeviceLogsOnStart,
     adbExecTimeout,
+    useKeystore,
+    keystorePath,
+    keystorePassword,
+    keyAlias,
+    keyPassword,
   });
 };
 

diff --git a/test/unit/android-helper-specs.js b/test/unit/android-helper-specs.js
@@ -271,6 +271,11 @@ describe('Android Helpers', function () {
         remoteAdbHost: 'remote_host',
         clearDeviceLogsOnStart: true,
         adbExecTimeout: 50,
+        useKeystore: true,
+        keystorePath: '/some/path',
+        keystorePassword: '123456',
+        keyAlias: 'keyAlias',
+        keyPassword: 'keyPassword',
       });
       ADB.createADB.calledWithExactly({
         javaVersion: "1.7",
@@ -279,6 +284,11 @@ describe('Android Helpers', function () {
         remoteAdbHost: "remote_host",
         clearDeviceLogsOnStart: true,
         adbExecTimeout: 50,
+        useKeystore: true,
+        keystorePath: '/some/path',
+        keystorePassword: '123456',
+        keyAlias: 'keyAlias',
+        keyPassword: 'keyPassword',
       }).should.be.true;
       curDeviceId.should.equal("111222");
       emulatorPort.should.equal("111");