diff options
| -rw-r--r-- | lib/puppet/indirector/catalog/active_record.rb | 8 | ||||
| -rwxr-xr-x | spec/unit/indirector/catalog/active_record.rb | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/puppet/indirector/catalog/active_record.rb b/lib/puppet/indirector/catalog/active_record.rb index ad2dc742b..66348f9a4 100644 --- a/lib/puppet/indirector/catalog/active_record.rb +++ b/lib/puppet/indirector/catalog/active_record.rb @@ -26,9 +26,11 @@ class Puppet::Resource::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord host = ar_model.find_by_name(catalog.name) || ar_model.create(:name => catalog.name) - host.merge_resources(catalog.vertices) - host.last_compile = Time.now + host.railsmark "Saved catalog to database" do + host.merge_resources(catalog.vertices) + host.last_compile = Time.now - host.save + host.save + end end end diff --git a/spec/unit/indirector/catalog/active_record.rb b/spec/unit/indirector/catalog/active_record.rb index cf7484110..2b5395a36 100755 --- a/spec/unit/indirector/catalog/active_record.rb +++ b/spec/unit/indirector/catalog/active_record.rb @@ -77,6 +77,8 @@ describe Puppet::Resource::Catalog::ActiveRecord do describe "when saving an instance" do before do @host = stub 'host', :name => "foo", :save => nil, :merge_resources => nil, :last_compile= => nil + @host.stubs(:railsmark).yields + Puppet::Rails::Host.stubs(:find_by_name).returns @host @catalog = Puppet::Resource::Catalog.new("foo") @request = stub 'request', :key => "foo", :instance => @catalog |