Make tests more stable

jenkinsci · Feb 24, 2019 · 96d9f19 · 96d9f19
1 parent 3e21e97
commit 96d9f19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
     <maven-jacoco.version>0.8.1</maven-jacoco.version>
 
     <!-- parent override -->
-    <surefire.rerunFailingTestsCount>3</surefire.rerunFailingTestsCount>
+    <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
   </properties>
 
   <dependencies>

diff --git a/src/test/java/org/jenkinsci/plugins/kubernetes/cli/KubectlBuildStepTest.java b/src/test/java/org/jenkinsci/plugins/kubernetes/cli/KubectlBuildStepTest.java
@@ -40,7 +40,7 @@ public void testScopedCredentials() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        waitForResult(b, Result.SUCCESS);
     }
 
     @Test
@@ -52,7 +52,7 @@ public void testMissingScopedCredentials() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
+        waitForResult(b, Result.FAILURE);
         r.assertLogContains("ERROR: No credentials found for id \"cred1234\"", b);
     }
 
@@ -64,7 +64,7 @@ public void testSecretWithSpace() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        waitForResult(b, Result.SUCCESS);
         r.assertLogNotContains("with-space", b);
         r.assertLogNotContains("s3cr3t", b);
     }
@@ -77,7 +77,7 @@ public void testUsernamePasswordWithSpace() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        waitForResult(b, Result.SUCCESS);
         r.assertLogNotContains("with-passwordspace", b);
         r.assertLogNotContains("s3cr3t", b);
     }
@@ -90,7 +90,7 @@ public void testKubeConfigDisposed() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectlFailure.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
+        waitForResult(b, Result.FAILURE);
         r.assertLogContains("kubectl configuration cleaned up", b);
     }
 
@@ -100,7 +100,7 @@ public void testCredentialNotProvided() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectlWithEmptyCredential.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
+        waitForResult(b, Result.FAILURE);
         r.assertLogContains("ERROR: No credentials defined to setup Kubernetes CLI", b);
     }
 
@@ -112,7 +112,7 @@ public void testUnsupportedCredential() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
+        waitForResult(b, Result.FAILURE);
         r.assertLogContains("ERROR: Unsupported Credentials type org.jenkinsci.plugins.kubernetes.cli.utils.UnsupportedCredential", b);
     }
 
@@ -140,7 +140,7 @@ public void testInvalidCertificate() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
+        waitForResult(b, Result.FAILURE);
         r.assertLogContains("ERROR: Uninitialized keystore", b);
     }
 
@@ -152,7 +152,15 @@ public void testServerProvidedWithFileCredential() throws Exception {
         p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatus(Result.SUCCESS, r.waitForCompletion(b));
+        waitForResult(b, Result.SUCCESS);
         r.assertLogContains("the serverUrl will be ignored as a raw kubeconfig file was provided", b);
     }
+
+    private void waitForResult(WorkflowRun b, Result result) throws Exception {
+        r.assertBuildStatus(result, r.waitForCompletion(b));
+
+        // Because else Jenkins would not always show all the logs
+        Thread.sleep(1000);
+    }
+
 }