Fail build when fallback enabled and remote execution fails (#48)

skrugly · Aug 26, 2020 · a39bbc4 · a39bbc4
1 parent dc93102
commit a39bbc4
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 0 deletions.
diff --git a/plugin-test/src/test/kotlin/FallbackTest.kt b/plugin-test/src/test/kotlin/FallbackTest.kt
@@ -3,6 +3,7 @@ import org.gradle.testkit.runner.GradleRunner
 import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.describe
 import org.jetbrains.spek.api.dsl.it
+import org.jetbrains.spek.api.dsl.on
 import java.io.FileWriter
 import java.io.PrintWriter
 
@@ -52,6 +53,45 @@ object FallbackTest : Spek({
                     testResult.assertTaskSkipped("downloadFromRemote")
                 }
             }
+
+            describe("successfully configured mirakle with fallback") {
+                beforeEachTest {
+                    folder.newFile("mirakle_init.gradle")
+                            .outputStream()
+                            .let(::PrintWriter)
+                            .use {
+                                it.append(MIRAKLE_INIT_WITH_FOLDER(folder.root.canonicalPath).replace("fallback false", "fallback true"))
+                            }
+                }
+
+                val gradleRunner by memoized {
+                    GradleRunner.create()
+                            .withProjectDir(folder.root)
+                            .withGradleVersion(gradleVersion)
+                            .forwardOutput()
+                            .withArguments("-I", "mirakle_init.gradle", "tasks")
+                }
+
+                val buildFile by memoized { folder.newFile("build.gradle.kts") }
+                fun buildFileWriter() = PrintWriter(FileWriter(buildFile, true))
+
+                on("exception occurred on remote side") {
+                    buildFileWriter().use { it.write(THROW) }
+                    val testResult = gradleRunner.testFail()
+
+                    it("should fail") {
+                        testResult.assertBuildFailed()
+                    }
+
+                    it("should execute download task") {
+                        testResult.assertTaskSucceed("downloadFromRemote")
+                    }
+
+                    it("should skip fallback task") {
+                        testResult.assertTaskSkipped("fallback")
+                    }
+                }
+            }
         }
     }
 })
diff --git a/plugin-test/src/test/kotlin/utils.kt b/plugin-test/src/test/kotlin/utils.kt
@@ -25,6 +25,7 @@ apply plugin: Mirakle
 rootProject {
     mirakle {
         host "localhost"
+        fallback false
         remoteFolder "$remoteFolder/mirakle"
     }
 }

diff --git a/plugin/src/main/kotlin/Mirakle.kt b/plugin/src/main/kotlin/Mirakle.kt
@@ -190,6 +190,12 @@ class Mirakle : Plugin<Gradle> {
 
                     execute.onlyIf { upload.execResult!!.exitValue == 0 }
                     download.onlyIf { upload.execResult!!.exitValue == 0 }
+
+                    mirakle.doLast {
+                        if (execute.didWork) {
+                            execute.execResult!!.assertNormalExitValue()
+                        }
+                    }
                 }
 
                 gradle.supportAndroidStudioAdvancedProfiling(config, upload, execute, download)