If robo test not set env variables.

Flank · Jun 3, 2020 · a390983 · a390983
1 parent edb3464
commit a390983
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt
@@ -3,6 +3,7 @@ package ftl.gc
 import com.google.api.services.testing.Testing
 import com.google.api.services.testing.model.Account
 import com.google.api.services.testing.model.AndroidDeviceList
+import com.google.api.services.testing.model.AndroidInstrumentationTest
 import com.google.api.services.testing.model.ClientInfo
 import com.google.api.services.testing.model.EnvironmentMatrix
 import com.google.api.services.testing.model.EnvironmentVariable
@@ -62,7 +63,7 @@ object GcAndroidTestMatrix {
             .setAdditionalApks(additionalApkGcsPaths.mapGcsPathsToApks())
             .setFilesToPush(otherFiles.mapToDeviceFiles())
 
-        if (args.environmentVariables.isNotEmpty()) {
+        if (args.environmentVariables.isNotEmpty() && androidTestConfig is AndroidTestConfig.Instrumentation) {
             testSetup.environmentVariables =
                 args.environmentVariables.map { it.toEnvironmentVariable() }
         }

diff --git a/test_runner/src/test/kotlin/Debug.kt b/test_runner/src/test/kotlin/Debug.kt
@@ -10,8 +10,8 @@ fun main() {
     // run "gradle check" to generate required fixtures
     val projectId = System.getenv("GOOGLE_CLOUD_PROJECT")
         ?: "YOUR PROJECT ID"
-    val quantity = "single"
-    val type = "robo"
+    val quantity = "multiple"
+    val type = "mixed"
 
     // Bugsnag keeps the process alive so we must call exitProcess
     // https://github.com/bugsnag/bugsnag-java/issues/151

diff --git a/test_runner/src/test/kotlin/ftl/fixtures/test_app_cases/flank-multiple-mixed.yml b/test_runner/src/test/kotlin/ftl/fixtures/test_app_cases/flank-multiple-mixed.yml
@@ -2,7 +2,10 @@ gcloud:
   app: ./src/test/kotlin/ftl/fixtures/tmp/apk/app-debug.apk
   robo-script: ./src/test/kotlin/ftl/fixtures/test_app_cases/MainActivity_robo_script.json
   num-flaky-test-attempts: 2
-
+  environment-variables:
+    coverage: true
+    coverageFilePath: /sdcard/
+    clearPackageData: true
 flank:
   disable-sharding: false
   max-test-shards: 2

diff --git a/test_runner/src/test/kotlin/ftl/fixtures/test_app_cases/flank-single-robo.yml b/test_runner/src/test/kotlin/ftl/fixtures/test_app_cases/flank-single-robo.yml
@@ -1,10 +1,6 @@
 gcloud:
   app: ./src/test/kotlin/ftl/fixtures/tmp/apk/app-debug.apk
-#  robo-script: ./src/test/kotlin/ftl/fixtures/test_app_cases/MainActivity_robo_script.json
-  robo-directives:
-    "click:button3": ""
-    "ignore:button1": ""
-    "ignore:button2": ""
+  robo-script: ./src/test/kotlin/ftl/fixtures/test_app_cases/MainActivity_robo_script.json
   environment-variables:
     coverage: true
     coverageFilePath: /sdcard/