JPERF-811: Fix flaky shouldTolerateEarlyFinish test by waiting until …

…OS actually starts (and finishes) the process before interrupting it
atlassian · Jun 22, 2022 · a1ba4f2 · a1ba4f2
1 parent 9e6442e
commit a1ba4f2
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/test/kotlin/com/atlassian/performance/tools/ssh/api/SshTest.kt b/src/test/kotlin/com/atlassian/performance/tools/ssh/api/SshTest.kt
@@ -56,14 +56,24 @@ class SshTest {
         SshContainer().useSsh { sshHost ->
             installPing(sshHost)
 
-            val fail = sshHost.runInBackground("nonexistent-command")
-            val failResult = fail.stop(Duration.ofMillis(20))
+            repeat(1000) {
+                val fail = sshHost.runInBackground("nonexistant-command")
+                sshHost.waitForAllProcessesToFinish("nonexistant-command", Duration.ofMillis(100))
+                val failResult = fail.stop(Duration.ofMillis(20))
 
-            Assert.assertEquals(127, failResult.exitStatus)
+                Assert.assertEquals(127, failResult.exitStatus)
+            }
         }
     }
 
     private fun installPing(sshHost: Ssh) {
         sshHost.newConnection().use { it.execute("apt-get update -qq && apt-get install iputils-ping -y") }
     }
+
+    private fun Ssh.waitForAllProcessesToFinish(
+        processCommand: String,
+        timeout: Duration
+    ) = this.newConnection().use {
+        it.execute("wait `pgrep '$processCommand'`", timeout)
+    }
 }