Merge pull request #690 from MarkEWaite/fix-centos-6-test-failures

Fix CentOS 6 test failures

Author: MarkEWaite

pom.xml

@@ -139,16 +139,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>nl.jqno.equalsverifier</groupId>
       <artifactId>equalsverifier</artifactId>

src/test/java/hudson/plugins/git/GitChangeSetPluginHistoryTest.java

@@ -25,10 +25,13 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import jenkins.plugins.git.GitSampleRepoRule;
+
 @RunWith(Parameterized.class)
 public class GitChangeSetPluginHistoryTest {
 
@@ -41,19 +44,25 @@ public class GitChangeSetPluginHistoryTest {
 
     private final GitChangeSet changeSet;
 
-    private static String gitVersion = "Unknown";
+    @ClassRule
+    public static GitSampleRepoRule sampleRepo = new GitSampleRepoRule();
 
     /* git 1.7.1 on CentOS 6.7 "whatchanged" generates no output for
      * the SHA1 hashes (from this repository) in this list. Rather
      * than skip testing on that old git version, this exclusion list
      * allows most tests to run. Debian 6 / git 1.7.2.5 also has the issue.
      */
     private static final String[] git171exceptions = {
+        "6e467b23",
         "750b6806",
         "7eeb070b",
         "87988f4d",
+        "94d982c2",
         "a571899e",
-        "bc71cd2d"
+        "b9e497b0",
+        "bc71cd2d",
+        "dcd329f4",
+        "edf066f3",
     };
 
     public GitChangeSetPluginHistoryTest(GitClient git, boolean authorOrCommitter, String sha1String) throws IOException, InterruptedException {
@@ -66,20 +75,6 @@ public GitChangeSetPluginHistoryTest(GitClient git, boolean authorOrCommitter, S
         changeSet = new GitChangeSet(changeLogStrings, authorOrCommitter);
     }
 
-    private static String getGitVersion() throws IOException {
-        Process process = new ProcessBuilder("git", "--version").start();
-        String version;
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-            version = "unknown";
-            String line;
-            while ((line = reader.readLine()) != null) {
-                version = line.trim();
-            }
-        }
-        process.destroy();
-        return version;
-    }
-
     /**
      * Merge changes won't compute their date in GitChangeSet, apparently as an
      * intentional design choice. Return all changes for this repository which
@@ -116,8 +111,6 @@ private static List<ObjectId> getNonMergeChanges(boolean honorExclusions) throws
 
     @Parameterized.Parameters(name = "{2}-{1}")
     public static Collection<Object[]> generateData() throws IOException, InterruptedException {
-        gitVersion = getGitVersion();
-
         List<Object[]> args = new ArrayList<>();
         String[] implementations = new String[]{"git", "jgit"};
         boolean[] choices = {true, false};
@@ -126,8 +119,7 @@ public static Collection<Object[]> generateData() throws IOException, Interrupte
             EnvVars envVars = new EnvVars();
             TaskListener listener = StreamTaskListener.fromStdout();
             GitClient git = Git.with(listener, envVars).in(new FilePath(new File("."))).using(implementation).getClient();
-            boolean honorExclusions = implementation.equals("git")
-                    && (gitVersion.equals("git version 1.7.1") || gitVersion.equals("git version 1.7.2.5"));
+            boolean honorExclusions = implementation.equals("git") && !sampleRepo.gitVersionAtLeast(1, 7, 10);
             List<ObjectId> allNonMergeChanges = getNonMergeChanges(honorExclusions);
             int count = allNonMergeChanges.size() / 10; /* 10% of all changes */
 

src/test/java/jenkins/plugins/git/AbstractGitSCMSourceRetrieveHeadsTest.java

@@ -52,7 +52,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import static jenkins.plugins.git.AbstractGitSCMSourceRetrieveHeadsTest.EXPECTED_GIT_EXE;
 import jenkins.plugins.git.traits.GitBrowserSCMSourceTrait;
 import jenkins.plugins.git.traits.GitToolSCMSourceTrait;
 import jenkins.scm.api.SCMFileSystem;
@@ -555,7 +554,7 @@ public AbstractGitSCMSourceImpl() {
         @NonNull
         @Override
         public List<SCMSourceTrait> getTraits() {
-            return Collections.<SCMSourceTrait>singletonList(new GitToolSCMSourceTrait(EXPECTED_GIT_EXE) {
+            return Collections.<SCMSourceTrait>singletonList(new GitToolSCMSourceTrait("git-custom") {
                 @Override
                 public SCMSourceTraitDescriptor getDescriptor() {
                     return new GitBrowserSCMSourceTrait.DescriptorImpl();

src/test/java/jenkins/plugins/git/GitSCMTelescopeTest.java

@@ -114,7 +114,7 @@ public boolean gitVersionAtLeast(int neededMajor, int neededMinor, int neededPat
         if (gitMajor < 1 || gitMajor > 3) {
             System.out.println("WARNING: Unexpected git major version " + gitMajor + " parsed from '" + versionOutput + "', field:'" + fields[0] + "'");
         }
-        if (gitMinor < 0 || gitMinor > 20) {
+        if (gitMinor < 0 || gitMinor > 50) {
             System.out.println("WARNING: Unexpected git minor version " + gitMinor + " parsed from '" + versionOutput + "', field:'" + fields[1] + "'");
         }
         if (gitPatch < 0 || gitPatch > 20) {