diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-24 05:43:27 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-24 05:43:27 +0000 |
commit | 52325f6bf868c5efa80fbcf06d139a31816251fb (patch) | |
tree | d38c865fe4271d8a32c71ad44034a90a97367bd7 /activesupport/test | |
parent | 19f59b6eb1eb83fb6b903ccdd4690f925c4ee247 (diff) | |
download | rails-52325f6bf868c5efa80fbcf06d139a31816251fb.tar.gz rails-52325f6bf868c5efa80fbcf06d139a31816251fb.tar.bz2 rails-52325f6bf868c5efa80fbcf06d139a31816251fb.zip |
Sever infinite loop for mutual dependencies. Closes #2997.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3181 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/dependencies/mutual_one.rb | 2 | ||||
-rw-r--r-- | activesupport/test/dependencies/mutual_two.rb | 2 | ||||
-rw-r--r-- | activesupport/test/dependencies/raises_exception.rb | 1 | ||||
-rw-r--r-- | activesupport/test/dependencies_test.rb | 18 |
4 files changed, 23 insertions, 0 deletions
diff --git a/activesupport/test/dependencies/mutual_one.rb b/activesupport/test/dependencies/mutual_one.rb new file mode 100644 index 0000000000..eb5e056efb --- /dev/null +++ b/activesupport/test/dependencies/mutual_one.rb @@ -0,0 +1,2 @@ +$mutual_dependencies_count += 1 +require_dependency 'mutual_two' diff --git a/activesupport/test/dependencies/mutual_two.rb b/activesupport/test/dependencies/mutual_two.rb new file mode 100644 index 0000000000..99ba337e55 --- /dev/null +++ b/activesupport/test/dependencies/mutual_two.rb @@ -0,0 +1,2 @@ +$mutual_dependencies_count += 1 +require_dependency 'mutual_one' diff --git a/activesupport/test/dependencies/raises_exception.rb b/activesupport/test/dependencies/raises_exception.rb index df8d8b79d0..69750eee72 100644 --- a/activesupport/test/dependencies/raises_exception.rb +++ b/activesupport/test/dependencies/raises_exception.rb @@ -1,2 +1,3 @@ $raises_exception_load_count += 1 raise 'Loading me failed, so do not add to loaded or history.' +$raises_exception_load_count += 1 diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index a59b0284a9..b801ce6cf0 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -79,4 +79,22 @@ class DependenciesTest < Test::Unit::TestCase ensure Dependencies.mechanism = old_mechanism end + + def test_mutual_dependencies_dont_infinite_loop + $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/dependencies" + old_mechanism, Dependencies.mechanism = Dependencies.mechanism, :load + + $mutual_dependencies_count = 0 + assert_nothing_raised { require_dependency 'mutual_one' } + assert_equal 2, $mutual_dependencies_count + + Dependencies.clear + + $mutual_dependencies_count = 0 + assert_nothing_raised { require_dependency 'mutual_two' } + assert_equal 2, $mutual_dependencies_count + ensure + $LOAD_PATH.shift + Dependencies.mechanism = old_mechanism + end end |