summaryrefslogtreecommitdiff
path: root/test/rake
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-28 06:05:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-28 06:05:43 +0000
commit15da4792dee9692f16f4fb435a7cf058da59fc69 (patch)
treede14ff7d3b15fd4dcf9e7b7dade0388825db3cd4 /test/rake
parentea9e8fedb3f34be88b97d634e5cf4e61bd05432e (diff)
test/rake: avoid leaking threads
* test/rake/test_rake_multi_task.rb (teardown): clean up thread pool to avoid leaking threads. * test/rake/test_rake_task_with_arguments.rb (teardown): ditto. * test/rake/test_rake_thread_pool.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rake')
-rw-r--r--test/rake/test_rake_multi_task.rb6
-rw-r--r--test/rake/test_rake_task_with_arguments.rb1
-rw-r--r--test/rake/test_rake_thread_pool.rb4
3 files changed, 11 insertions, 0 deletions
diff --git a/test/rake/test_rake_multi_task.rb b/test/rake/test_rake_multi_task.rb
index fe10caf1db..9f8fed6d50 100644
--- a/test/rake/test_rake_multi_task.rb
+++ b/test/rake/test_rake_multi_task.rb
@@ -13,6 +13,12 @@ class TestRakeMultiTask < Rake::TestCase
@mutex = Mutex.new
end
+ def teardown
+ Rake.application.thread_pool.join
+
+ super
+ end
+
def add_run(obj)
@mutex.synchronize do
@runs << obj
diff --git a/test/rake/test_rake_task_with_arguments.rb b/test/rake/test_rake_task_with_arguments.rb
index 9d56ffbe8a..8646fc041b 100644
--- a/test/rake/test_rake_task_with_arguments.rb
+++ b/test/rake/test_rake_task_with_arguments.rb
@@ -12,6 +12,7 @@ class TestRakeTaskWithArguments < Rake::TestCase
def teardown
Rake::TaskManager.record_task_metadata = false
+ Rake.application.thread_pool.join
super
end
diff --git a/test/rake/test_rake_thread_pool.rb b/test/rake/test_rake_thread_pool.rb
index 93f32fb35a..421c38d90d 100644
--- a/test/rake/test_rake_thread_pool.rb
+++ b/test/rake/test_rake_thread_pool.rb
@@ -33,6 +33,8 @@ class TestRakeTestThreadPool < Rake::TestCase
refute_equal threads[0], threads[1]
refute_equal Thread.current, threads[0]
refute_equal Thread.current, threads[1]
+ ensure
+ pool.join
end
def test_pool_creates_the_correct_number_of_threads
@@ -95,6 +97,8 @@ class TestRakeTestThreadPool < Rake::TestCase
assert_raises(CustomError) do
pool.future(2, &deep_exception_block).value
end
+ ensure
+ pool.join
end
def test_pool_prevents_deadlock