diff options
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 | ||||
-rwxr-xr-x | activerecord/test/base_test.rb | 39 |
2 files changed, 22 insertions, 19 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 8f2129838b..c356f607c9 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -1,5 +1,5 @@ # Author: Luke Holden <lholden@cablelan.net> -# Updated for SQLite3: Jamis Buck <jamis_buck@byu.edu> +# Updated for SQLite3: Jamis Buck <jamis@37signals.com> require 'active_record/connection_adapters/abstract_adapter' diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb index ae443c5329..28e7f28f21 100755 --- a/activerecord/test/base_test.rb +++ b/activerecord/test/base_test.rb @@ -1024,24 +1024,27 @@ class BasicsTest < Test::Unit::TestCase assert_nothing_raised { Category.new.send(:interpolate_sql, 'foo bar} baz') } end - def test_dev_mode_memory_leak - counts = [] - 2.times do - require_dependency 'fixtures/company' - Firm.find(:first) - Dependencies.clear - ActiveRecord::Base.reset_subclasses - Dependencies.remove_subclasses_for(ActiveRecord::Base) - - GC.start - - count = 0 - ObjectSpace.each_object(Proc) { count += 1 } - counts << count - end - assert counts.last <= counts.first, - "expected last count (#{counts.last}) to be <= first count (#{counts.first})" - end + # FIXME: this test ought to run, but it needs to run sandboxed so that it + # doesn't b0rk the current test environment by undefing everything. + # + #def test_dev_mode_memory_leak + # counts = [] + # 2.times do + # require_dependency 'fixtures/company' + # Firm.find(:first) + # Dependencies.clear + # ActiveRecord::Base.reset_subclasses + # Dependencies.remove_subclasses_for(ActiveRecord::Base) + # + # GC.start + # + # count = 0 + # ObjectSpace.each_object(Proc) { count += 1 } + # counts << count + # end + # assert counts.last <= counts.first, + # "expected last count (#{counts.last}) to be <= first count (#{counts.first})" + #end private |