Merge branch 'master' into 1951_Improve_Flank-Corellium_documentation

Flank · May 31, 2021 · 701a240 · 701a240
2 parents 6f52980 + 5a5e320
commit 701a240
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/corellium/client/src/main/kotlin/flank/corellium/client/agent/Connect.kt b/corellium/client/src/main/kotlin/flank/corellium/client/agent/Connect.kt
@@ -3,6 +3,7 @@ package flank.corellium.client.agent
 import flank.corellium.client.data.AgentOperation
 import flank.corellium.client.data.CommandResult
 import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
 import io.ktor.client.features.logging.LogLevel
 import io.ktor.client.features.logging.Logging
 import io.ktor.client.features.websocket.DefaultClientWebSocketSession
@@ -26,7 +27,7 @@ internal suspend fun connectAgent(
     token: String,
     logLevel: LogLevel = LogLevel.NONE
 ): Agent = run {
-    val client = HttpClient {
+    val client = HttpClient(CIO) {
         install(WebSockets)
         install(Logging) {
             level = logLevel

diff --git a/corellium/client/src/main/kotlin/flank/corellium/client/console/Connect.kt b/corellium/client/src/main/kotlin/flank/corellium/client/console/Connect.kt
@@ -1,6 +1,7 @@
 package flank.corellium.client.console
 
 import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
 import io.ktor.client.features.websocket.WebSockets
 import io.ktor.client.features.websocket.webSocketSession
 import io.ktor.client.request.header
@@ -13,7 +14,7 @@ internal suspend fun connectConsole(
     url: String,
     token: String
 ): Console =
-    HttpClient {
+    HttpClient(CIO) {
         install(WebSockets)
     }.webSocketSession {
         url(url)

diff --git a/test_configs/.gitignore b/test_configs/.gitignore
@@ -0,0 +1 @@
+corellium_auth.yml
diff --git a/test_configs/flank-corellium.yml b/test_configs/flank-corellium.yml
@@ -0,0 +1,6 @@
+auth: "test_configs/corellium_auth.yml"
+apks:
+  - path: "test_artifacts/master/apk/app-debug.apk"
+    tests:
+      - path: "test_artifacts/master/apk/app-multiple-flaky-debug-androidTest.apk"
+max-test-shards: 3