Signed-off-by: Luke Kanies <[email protected]>
---
lib/puppet/rails.rb | 1 -
spec/unit/rails.rb | 7 -------
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 5175acc..1a240e2 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -22,7 +22,6 @@ module Puppet::Rails
ActiveRecord::Base.logger.level = Logger::DEBUG
end
- ActiveRecord::Base.allow_concurrency = true
ActiveRecord::Base.verify_active_connections!
begin
diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb
index ab862a7..df3f149 100755
--- a/spec/unit/rails.rb
+++ b/spec/unit/rails.rb
@@ -39,7 +39,6 @@ describe Puppet::Rails, "when initializing any connection" do
ActiveRecord::Base.stubs(:logger).returns(logger)
logger.expects(:level=).with(Logger::DEBUG)
- ActiveRecord::Base.stubs(:allow_concurrency=)
ActiveRecord::Base.stubs(:verify_active_connections!)
ActiveRecord::Base.stubs(:establish_connection)
Puppet::Rails.stubs(:database_arguments)
@@ -47,12 +46,6 @@ describe Puppet::Rails, "when initializing any connection" do
Puppet::Rails.connect
end
- it "should set ActiveRecord::Base.allow_concurrency" do
- ActiveRecord::Base.expects(:allow_concurrency=).with(true)
-
- Puppet::Rails.connect
- end
-
it "should call ActiveRecord::Base.verify_active_connections!" do
ActiveRecord::Base.expects(:verify_active_connections!)
--
1.6.1
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
