Skip to content
Permalink
Browse files

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
  • Loading branch information
MarkEWaite committed Sep 13, 2014
1 parent 4682d5e commit 12351a2ef8dc726144ae5e6234f0e240fc4a5977
Showing with 10 additions and 6 deletions.
  1. +1 −1 pom.xml
  2. +9 −5 src/test/java/hudson/plugins/git/CliGitSCMTriggerRemotePollTest.java
@@ -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>
@@ -60,11 +60,15 @@ public void testTags_with_TagBAnnotated() throws Exception {
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;
}

}

0 comments on commit 12351a2

Please sign in to comment.
You can’t perform that action at this time.