diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2010-04-12 22:33:32 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-05-02 18:01:24 +1000 |
| commit | 5258a0afccf0563d3000c63e261c201115c31c33 (patch) | |
| tree | f1016e3124eda9250aab8e4134a22243874e421d /spec/unit | |
| parent | bcde541e4433aa46c9f922b01e34368a09abb7e8 (diff) | |
Fixing #3533 - Removing all transaction cleanup
It's really slow and has no actual functionality
any more, since we just remove the catalogs from memory
anyway.
This should be a good speed boost for very little effort.
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Diffstat (limited to 'spec/unit')
| -rwxr-xr-x | spec/unit/resource/catalog.rb | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/spec/unit/resource/catalog.rb b/spec/unit/resource/catalog.rb index 73c327367..7583c015c 100755 --- a/spec/unit/resource/catalog.rb +++ b/spec/unit/resource/catalog.rb @@ -578,7 +578,6 @@ describe Puppet::Resource::Catalog, "when compiling" do @transaction = mock 'transaction' Puppet::Transaction.stubs(:new).returns(@transaction) @transaction.stubs(:evaluate) - @transaction.stubs(:cleanup) @transaction.stubs(:addtimes) end @@ -595,11 +594,6 @@ describe Puppet::Resource::Catalog, "when compiling" do @catalog.apply end - it "should clean up the transaction" do - @transaction.expects :cleanup - @catalog.apply - end - it "should return the transaction" do @catalog.apply.should equal(@transaction) end @@ -624,37 +618,6 @@ describe Puppet::Resource::Catalog, "when compiling" do @catalog.apply(:ignoreschedules => true) end - it "should remove resources created mid-transaction" do - args = {:name => "/yay", :ensure => :file} - resource = stub 'file', :ref => "File[/yay]", :catalog= => @catalog, :title => "/yay", :[] => "/yay" - @transaction = mock 'transaction' - Puppet::Transaction.stubs(:new).returns(@transaction) - @transaction.stubs(:evaluate) - @transaction.stubs(:cleanup) - @transaction.stubs(:addtimes) - Puppet::Type.type(:file).expects(:new).with(args).returns(resource) - resource.expects :remove - @catalog.apply do |trans| - @catalog.create_resource :file, args - @catalog.resource("File[/yay]").should equal(resource) - end - @catalog.resource("File[/yay]").should be_nil - end - - it "should remove resources added mid-transaction" do - @transaction = mock 'transaction' - Puppet::Transaction.stubs(:new).returns(@transaction) - @transaction.stubs(:evaluate) - @transaction.stubs(:cleanup) - @transaction.stubs(:addtimes) - file = Puppet::Type.type(:file).new(:name => "/yay", :ensure => :file) - @catalog.apply do |trans| - @catalog.add_resource file - @catalog.resource("File[/yay]").should_not be_nil - end - @catalog.resource("File[/yay]").should be_nil - end - it "should expire cached data in the resources both before and after the transaction" do @catalog.expects(:expire).times(2) @catalog.apply |
