Improve disposal test on failure

jenkinsci · Jul 16, 2018 · a5a8471 · a5a8471
1 parent 5f93c0f
commit a5a8471
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/kubernetes/cli/KubectlBuildStepTest.java b/src/test/java/org/jenkinsci/plugins/kubernetes/cli/KubectlBuildStepTest.java
@@ -86,11 +86,11 @@ public void testUsernamePasswordWithSpace() throws Exception {
     public void testKubeConfigDisposed() throws Exception {
         CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), usernamePasswordCredentialWithSpace(CREDENTIAL_ID));
 
-        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "testUsernamePasswordWithSpace");
-        p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectl.groovy"), true));
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "testCleanupOnFailure");
+        p.setDefinition(new CpsFlowDefinition(loadResource("mockedKubectlFailure.groovy"), true));
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
-        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
         r.assertLogContains("kubectl configuration cleaned up", b);
     }
 

diff --git a/src/test/resources/org/jenkinsci/plugins/kubernetes/cli/mockedKubectl.groovy b/src/test/resources/org/jenkinsci/plugins/kubernetes/cli/mockedKubectl.groovy
@@ -2,6 +2,7 @@ node{
   label "mocked-kubectl"
   stage('Run') {
     withKubeConfig([credentialsId: 'cred1234', serverUrl: 'https://localhost:6443']) {
+      sleep(1)
       echo "File has been configured '${env.KUBECONFIG}'"
     }
   }

diff --git a/src/test/resources/org/jenkinsci/plugins/kubernetes/cli/mockedKubectlFailure.groovy b/src/test/resources/org/jenkinsci/plugins/kubernetes/cli/mockedKubectlFailure.groovy
@@ -0,0 +1,9 @@
+node{
+  label "mocked-kubectl"
+  stage('Run') {
+    withKubeConfig([credentialsId: 'cred1234', serverUrl: 'https://localhost:6443']) {
+      sleep(1)
+      error("Build failed because of this and that..")
+    }
+  }
+}