Adapt tests for JENKINS-23299 fix and git-client-plugin 1.10.2

Intentionally skip one test, enable another Depend on git-client-plugin 1.10.2
jenkinsci · Sep 13, 2014 · f654185 · f654185
1 parent 8add485
commit f654185
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -252,7 +252,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>git-client</artifactId>
-      <version>1.10.1</version>
+      <version>1.10.2</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/test/java/hudson/plugins/git/CliGitSCMTriggerRemotePollTest.java b/src/test/java/hudson/plugins/git/CliGitSCMTriggerRemotePollTest.java
@@ -60,12 +60,16 @@ public void testTags_with_TagBAnnotated() throws Exception {
         if(SKIP_FAILING_TESTS) return; //TODO Fix productive code
         super.testTags_with_TagBAnnotated();
     }
-
+
+    /* Skip this test because git client 1.10.2 and later include a fix for
+     * JENKINS-23299.  The fix resolves refs/tags/tag_name as the commit to
+     * which tag_name points.  Prior to that change, the ref pointed to the
+     * SHA-1 of the tag, instead of the SHA-1 of the commit to which the tag
+     * points.  Because of that bug fix, the git plugin correctly detects
+     * refs/tags/TagA as needing to build.
+     */
     @Override
-    public void testTags_with_refsTagsTagBAnnotated() throws Exception
-    {
-        if(SKIP_FAILING_TESTS) return; //TODO Fix productive code
-        super.testTags_with_refsTagsTagBAnnotated();
+    public void testTags_with_refsTagsTagA() throws Exception {
+        return;
     }
-
-}
+}