From 6888d8293b0dbdd1dfcac86e0d6700a56b2b4f2b Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <d.w.nusbaum@gmail.com>
Date: Mon, 6 Mar 2023 16:17:54 -0500
Subject: [PATCH] Skip CpsFlowDefinitionRJRTest.flushLogsOnShutdown on Windows
 for now

---
 plugin/pom.xml                                                 | 1 -
 .../plugins/workflow/cps/CpsFlowDefinitionRJRTest.java         | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 911265c58..3f54de928 100644
--- 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
index 4083adb3f..d4de62386 100644
--- 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);