SCMSourceRetrieverTest: provide directly a sampleRepoNotifyCommit() to work around some GitSampleRepoRule.notifyCommit() issue

Author: jimklimov

src/test/java/org/jenkinsci/plugins/workflow/libs/SCMSourceRetrieverTest.java

@@ -40,8 +40,9 @@
 import hudson.model.Result;
 import hudson.model.Run;
 import hudson.model.TaskListener;
-import hudson.plugins.git.GitSCM;
+import hudson.plugins.git.ApiTokenPropertyConfiguration;
 import hudson.plugins.git.BranchSpec;
+import hudson.plugins.git.GitSCM;
 import hudson.scm.ChangeLogSet;
 import hudson.scm.SCM;
 import hudson.slaves.EnvironmentVariablesNodeProperty;
@@ -79,6 +80,7 @@
 import jenkins.scm.impl.subversion.SubversionSCMSource;
 import jenkins.scm.impl.subversion.SubversionSampleRepoRule;
 import org.apache.commons.io.FileUtils;
+import org.htmlunit.WebResponse;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -127,6 +129,28 @@ public class SCMSourceRetrieverTest {
     @Rule public LoggerRule logging = new LoggerRule().record(SCMBasedRetriever.class, Level.FINE);
 
     // Repetitive helpers for test cases dealing with @Issue("JENKINS-69731") and others
+    private void sampleRepoNotifyCommit(GitSampleRepoRule sampleRepo) throws Exception {
+        try {
+            sampleRepo.notifyCommit(r);
+        } catch(java.lang.NoSuchMethodError ignored) {
+            // Some versions of git-plugin maybe mix up "WebClient"
+            // from "JenkinsRule" and from "htmlunit" packages, while
+            // using the former implicitly. Maybe something else; says:
+            //  java.lang.NoSuchMethodError: 'com.gargoylesoftware.htmlunit.Page
+            //    org.jvnet.hudson.test.JenkinsRule$WebClient.goTo(java.lang.String, java.lang.String)'
+            // The catch-code below is an adapted copy of
+            // GitSampleRepoRule.notifyCommit() as of git-plugin-5.0.0:
+
+            // SKIPPED: protected code: sampleRepo.synchronousPolling(r);
+            String notifyCommitToken = ApiTokenPropertyConfiguration.get().generateApiToken("notifyCommit").getString("value");
+            JenkinsRule.WebClient wc = r.createWebClient();
+            WebResponse webResponse =
+                    wc.goTo("git/notifyCommit?url=" + sampleRepo.bareUrl() + "&token=" + notifyCommitToken, "text/plain").getWebResponse();
+            // SKIPPED logging of the response
+            r.waitUntilNoActivity();
+        }
+    }
+
     private void sampleRepo1ContentMaster() throws Exception {
         sampleRepo1ContentMaster(null);
     }
@@ -492,7 +516,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // definition of MBP "leaf" jobs, and launch of builds,
         // so below we just make sure they complete and analyze
         // the outcomes.
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
         System.out.println("Jobs generated by MBP: " + mbp.getItems().toString());
 
@@ -550,7 +574,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // definition of MBP "leaf" jobs, and launch of builds,
         // so below we just make sure they complete and analyze
         // the outcomes.
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
         System.out.println("Jobs generated by MBP: " + mbp.getItems().toString());
 
@@ -608,7 +632,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // definition of MBP "leaf" jobs, and launch of builds,
         // so below we just make sure they complete and analyze
         // the outcomes.
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
         System.out.println("Jobs generated by MBP: " + mbp.getItems().toString());
 
@@ -681,7 +705,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         mbp.save();
         // Rescan to actually define leaf jobs:
         mbp.scheduleBuild(0);
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
         System.out.println("All Jenkins items: " + r.jenkins.getItems().toString());
         System.out.println("MBP sources: " + mbp.getSourcesList().toString());
@@ -770,7 +794,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         mbp.save();
         // Rescan to actually define leaf jobs:
         mbp.scheduleBuild(0);
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
         System.out.println("All Jenkins items: " + r.jenkins.getItems().toString());
         System.out.println("MBP sources: " + mbp.getSourcesList().toString());
@@ -855,7 +879,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
 
         WorkflowJob p0 = r.jenkins.createProject(WorkflowJob.class, "p0");
         p0.setDefinition(new CpsScmFlowDefinition(gitSCM, "Jenkinsfile"));
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
 
         WorkflowRun b0 = r.buildAndAssertSuccess(p0);
@@ -896,7 +920,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
 
         WorkflowJob p0 = r.jenkins.createProject(WorkflowJob.class, "p0");
         p0.setDefinition(new CpsScmFlowDefinition(gitSCM, "Jenkinsfile"));
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
 
         WorkflowRun b0 = r.buildAndAssertSuccess(p0);
@@ -945,7 +969,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
                 Collections.singletonList(new BranchSpec("*/feature")),
                 null, null, Collections.emptyList());
 
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
 
         // First run a job definition with a fixed library version,
@@ -1070,7 +1094,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
 
         WorkflowJob p1 = r.jenkins.createProject(WorkflowJob.class, "p1");
         p1.setDefinition(new CpsScmFlowDefinition(gitSCM, "Jenkinsfile"));
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
         p1.scheduleBuild2(0);
         r.waitUntilNoActivity();
@@ -1131,7 +1155,7 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         csfd.setLightweight(true);
         WorkflowJob p0 = r.jenkins.createProject(WorkflowJob.class, "p0");
         p0.setDefinition(csfd);
-        sampleRepo2.notifyCommit(r);
+        sampleRepoNotifyCommit(sampleRepo2);
         r.waitUntilNoActivity();
 
         WorkflowRun b0 = r.buildAndAssertSuccess(p0);