Merge pull request #8 from Banno/install-sequentially

Install APKs Sequentially
Banno · Nov 13, 2019 · dcc9b7b · dcc9b7b
2 parents 773a2f6 + 5e76aee
commit dcc9b7b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/gordon-plugin/src/main/kotlin/com/banno/gordon/AdbExtensions.kt b/gordon-plugin/src/main/kotlin/com/banno/gordon/AdbExtensions.kt
@@ -52,8 +52,12 @@ internal fun JadbDevice.installApk(apk: File, vararg options: String) = IO.fx {
 
     PackageManager(this@installApk).remove(remoteFile)
 
-    if (result == null || !result.contains("Success")) {
-        raiseError<Unit>(IllegalStateException("Failed to install ${apk.name} on $serial\n$result")).bind()
+    when {
+        result == null -> raiseError<Unit>(IllegalStateException("Install timed out for ${apk.name} on $serial")).bind()
+
+        !result.contains("Success") -> raiseError<Unit>(IllegalStateException("Failed to install ${apk.name} on $serial\n$result")).bind()
+
+        else -> Unit
     }
 }
 
@@ -80,26 +84,21 @@ internal fun List<JadbDevice>.uninstall(
 }
 
 internal fun List<JadbDevice>.reinstall(
-    dispatcher: CoroutineDispatcher,
     logger: Logger,
     applicationPackage: String,
     instrumentationPackage: String,
     applicationApk: File,
     instrumentationApk: File
 ) = IO {
-    runBlocking {
-        map { device ->
-            async(context = dispatcher, start = CoroutineStart.LAZY) {
-                val packageManager = PackageManager(device)
-                logger.lifecycle("${device.serial}: installing $applicationPackage")
-                packageManager.safeUninstall(applicationPackage)
-                device.installApk(applicationApk, "-d", "-r").unsafeRunSync()
-                if (instrumentationApk != applicationApk) {
-                    logger.lifecycle("${device.serial}: installing $instrumentationPackage")
-                    packageManager.safeUninstall(instrumentationPackage)
-                    device.installApk(instrumentationApk, "-d", "-r", "-t").unsafeRunSync()
-                }
-            }
-        }.awaitAll()
+    forEach { device ->
+        val packageManager = PackageManager(device)
+        logger.lifecycle("${device.serial}: installing $applicationPackage")
+        packageManager.safeUninstall(applicationPackage)
+        device.installApk(applicationApk, "-d", "-r").unsafeRunSync()
+        if (instrumentationApk != applicationApk) {
+            logger.lifecycle("${device.serial}: installing $instrumentationPackage")
+            packageManager.safeUninstall(instrumentationPackage)
+            device.installApk(instrumentationApk, "-d", "-r", "-t").unsafeRunSync()
+        }
     }
 }
diff --git a/gordon-plugin/src/main/kotlin/com/banno/gordon/GordonTestTask.kt b/gordon-plugin/src/main/kotlin/com/banno/gordon/GordonTestTask.kt
@@ -85,7 +85,6 @@ internal abstract class GordonTestTask : DefaultTask() {
             }
 
             pools.flatMap { it.devices }.reinstall(
-                dispatcher = Dispatchers.Default,
                 logger = logger,
                 applicationPackage = applicationPackage,
                 instrumentationPackage = instrumentationPackage,