Skip to content

Commit 6888d82

Browse files
committed
Skip CpsFlowDefinitionRJRTest.flushLogsOnShutdown on Windows for now
1 parent d49313e commit 6888d82

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<node.version>18.13.0</node.version>
4646
<npm.version>8.19.3</npm.version>
4747
<yarn.version>1.22.19</yarn.version>
48-
<jenkins.version>2.391</jenkins.version> <!-- TODO: Trying to diagnose errors with RealJenkinsRule in tests -->
4948
</properties>
5049
<dependencyManagement>
5150
<dependencies>

plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package org.jenkinsci.plugins.workflow.cps;
22

3+
import hudson.Functions;
34
import java.util.logging.Level;
45
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
56
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
7+
import org.junit.Assume;
68
import org.junit.Rule;
79
import org.junit.Test;
810
import org.jvnet.hudson.test.JenkinsRule;
@@ -26,6 +28,7 @@ private static void doesItSmoke(JenkinsRule r) throws Exception {
2628

2729
@Test
2830
public void flushLogsOnShutdown() throws Throwable {
31+
Assume.assumeFalse("RealJenkinsRule does not shut down Jenkins cleanly on Windows, see https://github.com/jenkinsci/jenkins-test-harness/pull/559", Functions.isWindows());
2932
rjr.withLogger(CpsFlowExecution.class, Level.FINER);
3033
rjr.then(CpsFlowDefinitionRJRTest::flushLogsOnShutdownPreRestart);
3134
rjr.then(CpsFlowDefinitionRJRTest::flushLogsOnShutdownPostRestart);

0 commit comments

Comments
 (0)