Merge pull request #274 from jonesbusy/feature/reactivate-tests

Fix JobDSL for #271 and reactive test
jenkinsci · Mar 6, 2024 · 00180ef · 00180ef
2 parents 64afb0d + 85332b0
commit 00180ef
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/main/java/jenkins/plugins/jobcacher/CacheWrapper.java b/src/main/java/jenkins/plugins/jobcacher/CacheWrapper.java
@@ -94,22 +94,17 @@ public void setSkipSave(boolean skipSave) {
         this.skipSave = skipSave;
     }
 
-    @DataBoundSetter
     @SuppressWarnings("unused")
     public boolean getSkipRestore() {
         return skipRestore;
     }
 
+    @DataBoundSetter
     @SuppressWarnings("unused")
     public void setSkipRestore(boolean skipRestore) {
         this.skipRestore = skipRestore;
     }
 
-    @SuppressWarnings("unused")
-    public boolean setSkipRestore() {
-        return skipRestore;
-    }
-
     @SuppressWarnings("unused")
     public String getDefaultBranch() {
         return defaultBranch;

diff --git a/src/test/java/jenkins/plugins/jobdsl/JobDslTest.java b/src/test/java/jenkins/plugins/jobdsl/JobDslTest.java
@@ -8,7 +8,6 @@
 import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -30,7 +29,6 @@ public class JobDslTest {
 
     @Test
     @Issue("https://github.com/jenkinsci/jobcacher-plugin/issues/271")
-    @Ignore
     public void shouldCreateFreestyleJob() throws Exception {
         runJobDsl("/jobdsl/freestyle.groovy", jenkins);
         CacheWrapper step = jenkins.jenkins.getItemByFullName("freestyle", FreeStyleProject.class).getBuildWrappersList().get(CacheWrapper.class);