summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-24 05:13:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-24 05:13:55 +0000
commit071e1ba1f86211d742e43a67bc5e106b5a69cddf (patch)
tree73fcbad2b2178431e9873f25caff317d3eb6c92a
parent98ac9b866747306edd7cd9437d74c7af51a3a9da (diff)
* lib/test/unit.rb (Test::Unit::Mini#run_test_suites): ensure
output sync mode to be restored. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/test/unit.rb11
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c5a581c7ca..7d0fd38cdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 24 14:13:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit.rb (Test::Unit::Mini#run_test_suites): ensure
+ output sync mode to be restored.
+
Sun Oct 24 14:11:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (vm_define_method): defined method is run with the default
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index f722205fa4..b5b9f719b1 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -156,11 +156,18 @@ module Test
def self.autorun
at_exit {
Test::Unit::RunCount.run_once {
- exit(Test::Unit::Mini.new.run(ARGV) || true)
- }
+ exit(Test::Unit::Mini.new.run(ARGV) || true)
+ }
} unless @@installed_at_exit
@@installed_at_exit = true
end
+
+ def run_test_suites(*args)
+ old_sync = @@out.sync if @@out.respond_to?(:sync=)
+ super
+ ensure
+ @@out.sync = old_sync if @@out.respond_to?(:sync=)
+ end
end
end
end