Skip CpsFlowDefinitionRJRTest.flushLogsOnShutdown on Windows for now

jenkinsci · Mar 6, 2023 · 6888d82 · 6888d82
1 parent d49313e
commit 6888d82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -45,7 +45,6 @@
         <node.version>18.13.0</node.version>
         <npm.version>8.19.3</npm.version>
         <yarn.version>1.22.19</yarn.version>
-        <jenkins.version>2.391</jenkins.version> <!-- TODO: Trying to diagnose errors with RealJenkinsRule in tests -->
     </properties>
     <dependencyManagement>
         <dependencies>

diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java
@@ -1,8 +1,10 @@
 package org.jenkinsci.plugins.workflow.cps;
 
+import hudson.Functions;
 import java.util.logging.Level;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -26,6 +28,7 @@ private static void doesItSmoke(JenkinsRule r) throws Exception {
 
     @Test
     public void flushLogsOnShutdown() throws Throwable {
+        Assume.assumeFalse("RealJenkinsRule does not shut down Jenkins cleanly on Windows, see https://github.com/jenkinsci/jenkins-test-harness/pull/559", Functions.isWindows());
         rjr.withLogger(CpsFlowExecution.class, Level.FINER);
         rjr.then(CpsFlowDefinitionRJRTest::flushLogsOnShutdownPreRestart);
         rjr.then(CpsFlowDefinitionRJRTest::flushLogsOnShutdownPostRestart);