Fix critical bug with default timeouts in 'startProcess' and 'startCo…

…mmand'
kochetkov-ma · Nov 26, 2020 · 12e7f18 · 12e7f18
1 parent a76dba9
commit 12e7f18
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/kotlin/ru/iopump/koproc/extension.kt b/src/main/kotlin/ru/iopump/koproc/extension.kt
@@ -23,7 +23,7 @@ var koprocDefaultStartCommandTimeoutSec = 10L
  *
  * @return [KoprocCall]
  */
-fun String.startProcess(config: KoprocConfig.() -> Unit = { KoprocConfig(koprocDefaultStartProcessTimeoutSec) }): KoprocCall {
+fun String.startProcess(config: KoprocConfig.() -> Unit = { timeoutSec = koprocDefaultStartProcessTimeoutSec }): KoprocCall {
     val cfg = KoprocConfig().apply(config)
 
     val processBuilder = ProcessBuilder(*this.split.toTypedArray())
@@ -42,7 +42,7 @@ fun String.startProcess(config: KoprocConfig.() -> Unit = { KoprocConfig(koprocD
  *
  * @return [KoprocResult]
  */
-fun String.startCommand(config: KoprocConfig.() -> Unit = { KoprocConfig(koprocDefaultStartCommandTimeoutSec) }): KoprocResult =
+fun String.startCommand(config: KoprocConfig.() -> Unit = { timeoutSec = koprocDefaultStartCommandTimeoutSec }): KoprocResult =
     this.startProcess(config).result
 
 private val String.split

diff --git a/src/test/kotlin/ru/iopump/koproc/ExtensionKtIT.kt b/src/test/kotlin/ru/iopump/koproc/ExtensionKtIT.kt
@@ -120,5 +120,14 @@ class ExtensionKtIT : StringSpec() {
                 it.throwOnAnyFailure()
             }
         }
+
+        "Default timeout [bug in 1.1.0]" {
+            koprocDefaultStartCommandTimeoutSec = 1
+            val jarPath = Paths.get(this::class.java.getResource("/koproc-sample.jar").toURI())
+            "java -jar $jarPath".startCommand()
+
+            koprocDefaultStartProcessTimeoutSec = 1
+            "java -jar $jarPath".startProcess().result
+        }
     }
 }