Review changes

Flank · Aug 9, 2021 · f49c523 · f49c523
1 parent a0605ad
commit f49c523
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/run/platform/android/ResolveApks.kt b/test_runner/src/main/kotlin/ftl/run/platform/android/ResolveApks.kt
@@ -41,10 +41,11 @@ private fun AndroidArgs.mainApkContext() = appApk?.let { appApk ->
 private fun AndroidArgs.additionalApksContexts() = additionalAppTestApks.map {
     val appApk = (it.app ?: appApk)
         ?: throw FlankGeneralError("Cannot create app-test apks pair for instrumentation tests, missing app apk for test ${it.test}")
+    val envs = it.environmentVariables.takeIf { envs -> envs.isNotEmpty() } ?: environmentVariables
     InstrumentationTestContext(
         app = appApk.asFileReference(),
         test = it.test.asFileReference(),
-        environmentVariables = it.environmentVariables.takeIf { envs -> envs.isNotEmpty() } ?: environmentVariables,
+        environmentVariables = envs,
         testTargetsForShard = testTargetsForShard,
         args = copy(
             commonArgs = commonArgs.copy(
@@ -55,7 +56,7 @@ private fun AndroidArgs.additionalApksContexts() = additionalAppTestApks.map {
             testApk = it.test,
             testTargets = it.testTargets ?: testTargets,
             parameterizedTests = it.parameterizedTests ?: parameterizedTests,
-            environmentVariables = it.environmentVariables.takeIf { envs -> envs.isNotEmpty() } ?: environmentVariables,
+            environmentVariables = envs
         )
     )
 }.toTypedArray()