From 4073505065a0937d67c45860988fbe634a700c37 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 15 Mar 2012 12:21:20 +0000 Subject: escape commas in paths before globbing to avoid infinite hang in Dir[] --- activesupport/test/file_update_checker_test.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'activesupport/test/file_update_checker_test.rb') diff --git a/activesupport/test/file_update_checker_test.rb b/activesupport/test/file_update_checker_test.rb index dd2483287b..c884068c59 100644 --- a/activesupport/test/file_update_checker_test.rb +++ b/activesupport/test/file_update_checker_test.rb @@ -1,5 +1,6 @@ require 'abstract_unit' require 'fileutils' +require 'thread' MTIME_FIXTURES_PATH = File.expand_path("../fixtures", __FILE__) @@ -79,4 +80,18 @@ class FileUpdateCheckerWithEnumerableTest < ActiveSupport::TestCase assert !checker.execute_if_updated assert_equal 0, i end + + def test_should_not_block_if_a_strange_filename_used + FileUtils.mkdir_p("tmp_watcher/valid,yetstrange,path,") + FileUtils.touch(FILES.map { |file_name| "tmp_watcher/valid,yetstrange,path,/#{file_name}" } ) + + test = Thread.new do + checker = ActiveSupport::FileUpdateChecker.new([],"tmp_watcher/valid,yetstrange,path," => :txt){ i += 1 } + Thread.exit + end + test.priority = -1 + test.join(5) + + assert !test.alive? + end end -- cgit v1.2.3 From 15404fd3da335086cf1ceb195e524455a633265f Mon Sep 17 00:00:00 2001 From: Sandeep Date: Fri, 16 Mar 2012 17:14:54 +0530 Subject: fixed - warning: assigned but unused variable - checker --- activesupport/test/file_update_checker_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/test/file_update_checker_test.rb') diff --git a/activesupport/test/file_update_checker_test.rb b/activesupport/test/file_update_checker_test.rb index c884068c59..988dfd71eb 100644 --- a/activesupport/test/file_update_checker_test.rb +++ b/activesupport/test/file_update_checker_test.rb @@ -86,7 +86,7 @@ class FileUpdateCheckerWithEnumerableTest < ActiveSupport::TestCase FileUtils.touch(FILES.map { |file_name| "tmp_watcher/valid,yetstrange,path,/#{file_name}" } ) test = Thread.new do - checker = ActiveSupport::FileUpdateChecker.new([],"tmp_watcher/valid,yetstrange,path," => :txt){ i += 1 } + ActiveSupport::FileUpdateChecker.new([],"tmp_watcher/valid,yetstrange,path," => :txt){ i += 1 } Thread.exit end test.priority = -1 -- cgit v1.2.3 From c045eebd5d35259e65771de159966b7c20690d34 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 16 Mar 2012 00:54:39 -0300 Subject: Remove deprecation from AS::Deprecation behavior, some minor cleanups * Refactor log subscriber, use select! to avoid a new object * Remove deprecation messages related to AS::Deprecation behavior This was added about 2 years ago for Rails 3: https://github.com/rails/rails/commit/d4c7d3fd94e5a885a6366eaeb3b908bb58ffd4db * Remove some not used requires * Refactor delegate to avoid string conversions and if statements inside each block --- activesupport/test/file_update_checker_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/test/file_update_checker_test.rb') diff --git a/activesupport/test/file_update_checker_test.rb b/activesupport/test/file_update_checker_test.rb index 988dfd71eb..066db7c0f9 100644 --- a/activesupport/test/file_update_checker_test.rb +++ b/activesupport/test/file_update_checker_test.rb @@ -83,10 +83,10 @@ class FileUpdateCheckerWithEnumerableTest < ActiveSupport::TestCase def test_should_not_block_if_a_strange_filename_used FileUtils.mkdir_p("tmp_watcher/valid,yetstrange,path,") - FileUtils.touch(FILES.map { |file_name| "tmp_watcher/valid,yetstrange,path,/#{file_name}" } ) + FileUtils.touch(FILES.map { |file_name| "tmp_watcher/valid,yetstrange,path,/#{file_name}" }) test = Thread.new do - ActiveSupport::FileUpdateChecker.new([],"tmp_watcher/valid,yetstrange,path," => :txt){ i += 1 } + ActiveSupport::FileUpdateChecker.new([],"tmp_watcher/valid,yetstrange,path," => :txt) { i += 1 } Thread.exit end test.priority = -1 -- cgit v1.2.3