summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/minitest/metametameta.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 69e4083c84..ee30615eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 7 22:55:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/minitest/metametameta.rb (with_output): restore output to
+ fix mixing test result output in worker responses.
+
Wed Oct 7 21:32:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_duplicate): move from rb_str_resurrect to short
diff --git a/test/minitest/metametameta.rb b/test/minitest/metametameta.rb
index 87bc56c93b..9ffbdb0569 100644
--- a/test/minitest/metametameta.rb
+++ b/test/minitest/metametameta.rb
@@ -57,12 +57,13 @@ class MetaMetaMetaTestCase < MiniTest::Unit::TestCase
def with_output
synchronize do
begin
+ save = MiniTest::Unit.output
@output = StringIO.new("")
MiniTest::Unit.output = @output
yield
ensure
- MiniTest::Unit.output = STDOUT
+ MiniTest::Unit.output = save
end
end
end