feat: add option --junitxml-disable-output-capture

Author: kenichiice

lib/test/unit/runner/junitxml.rb

@@ -12,6 +12,10 @@ module Unit
               "Outputs to FILE_NAME") do |name|
         auto_runner.runner_options[:junitxml_output_file] = name
       end
+      opts.on("--junitxml-disable-output-capture",
+              "Disable output capture") do |b|
+        auto_runner.runner_options[:junitxml_disable_output_capture] = b
+      end
     end
   end
 end

lib/test/unit/ui/junitxml/testrunner.rb

@@ -51,16 +51,20 @@ def test_suite_finished(suite)
           def test_started(test)
             test_case = JUnitTestCase.new(test.class.name, test.description)
             @junit_test_suites.last << test_case
-            @stdout_org = $stdout
-            @stderr_org = $stderr
-            $stdout = test_case.stdout
-            $stderr = test_case.stderr
+            unless @options[:junitxml_disable_output_capture]
+              @stdout_org = $stdout
+              @stderr_org = $stderr
+              $stdout = test_case.stdout
+              $stderr = test_case.stderr
+            end
           end
 
           def test_finished(test)
             @junit_test_suites.last.test_cases.last.time = test.elapsed_time
-            $stdout = @stdout_org
-            $stderr = @stderr_org
+            unless @options[:junitxml_disable_output_capture]
+              $stdout = @stdout_org
+              $stderr = @stderr_org
+            end
           end
 
           def result_pass_assertion(result)

test/test_xml_with_output.rb test/test_xml_with_output_capture.rbtest/test_xml_with_output.rb renamed to test/test_xml_with_output_capture.rb

@@ -0,0 +1,117 @@
+require "stringio"
+require 'rexml/document'
+require "test/unit"
+require "test/unit/ui/junitxml/testrunner"
+require_relative "check"
+
+class TestXmlWithoutOutputCapture < Test::Unit::TestCase
+  include Check
+
+  setup do
+    test_case = Class.new(Test::Unit::TestCase) do
+      include Test::Unit::Util::Output
+
+      test "success" do
+        assert_equal(1, 1)
+        puts("out 1")
+      end
+
+      def test_failure
+        assert_equal(1, 1)
+        warn("warn 1")
+        assert_equal(1, 2)
+      end
+
+      def test_error
+        warn("warn 2")
+        puts("out 2")
+        assert_equal(1, 1)
+        assert_equal(1, 1)
+        assert_equal(1, 1)
+        raise "hello"
+      end
+
+      def test_omission
+        puts("out 3")
+        omit("omission 1")
+      end
+
+      def test_pending
+        warn("warn 3")
+        pend("pending 1")
+      end
+
+      def test_with_capture_output
+        out, err = capture_output do
+          puts("out 4")
+          warn("warn 4")
+        end
+        assert_equal("out 4\n", out)
+        assert_equal("warn 4\n", err)
+      end
+    end
+
+    output = StringIO.new
+    runner = Test::Unit::UI::JUnitXml::TestRunner.new(
+      test_case.suite,
+      :output => output,
+      :junitxml_disable_output_capture => true)
+    runner.start
+
+    output.rewind
+    @doc = REXML::Document.new(output)
+  end
+
+  test "testsuites" do
+    testsuites_array = @doc.get_elements("/testsuites")
+    assert_equal(1, testsuites_array.size)
+  end
+
+  test "testsuite" do
+    testsuite_array = @doc.get_elements("/testsuites/testsuite")
+    assert_equal(1, testsuite_array.size)
+    check_testsuite(testsuite_array.first, "", 6, 1, 1, 2)
+  end
+
+  test "testcase success" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='success']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_success(testcase_array.first, "", 1)
+  end
+
+  test "testcase failure" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_failure()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_failure(testcase_array.first, "", 2, /.+/)
+  end
+
+  test "testcase error" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_error()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_error(testcase_array.first, "", 3, "hello")
+  end
+
+  test "testcase omission" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_omission()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_skipped(testcase_array.first, "", 0, "omission 1")
+  end
+
+  test "testcase pending" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_pending()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_skipped(testcase_array.first, "", 0, "pending 1")
+  end
+
+  test "testcase test_with_capture_output" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_with_capture_output()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_success(testcase_array.first, "", 2)
+  end
+end