Merge pull request #7440 from rubygems/troubleshoot_windows_ci

Fix some flaky test failures on Windows

Author: deivid-rodriguez

bundler/spec/support/command_execution.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spec
-  CommandExecution = Struct.new(:command, :working_directory, :exitstatus, :stdout, :stderr) do
+  CommandExecution = Struct.new(:command, :working_directory, :exitstatus, :original_stdout, :original_stderr) do
     def to_s
       "$ #{command}"
     end
@@ -11,6 +11,19 @@ def stdboth
       @stdboth ||= [stderr, stdout].join("\n").strip
     end
 
+    def stdout
+      original_stdout
+    end
+
+    # Can be removed once/if https://github.com/oneclick/rubyinstaller2/pull/369 is resolved
+    def stderr
+      return original_stderr unless Gem.win_platform?
+
+      original_stderr.split("\n").reject do |l|
+        l.include?("operating_system_defaults")
+      end.join("\n")
+    end
+
     def to_s_verbose
       [
         to_s,

bundler/spec/support/helpers.rb

@@ -193,8 +193,8 @@ def sys_exec(cmd, options = {})
 
         stdout_read_thread = Thread.new { stdout.read }
         stderr_read_thread = Thread.new { stderr.read }
-        command_execution.stdout = stdout_read_thread.value.strip
-        command_execution.stderr = stderr_read_thread.value.strip
+        command_execution.original_stdout = stdout_read_thread.value.strip
+        command_execution.original_stderr = stderr_read_thread.value.strip
 
         status = wait_thr.value
         command_execution.exitstatus = if status.exited?