diff options
| -rw-r--r-- | lib/puppet/parser/collector.rb | 6 | ||||
| -rwxr-xr-x | spec/unit/parser/collector.rb | 26 | ||||
| -rwxr-xr-x | test/rails/collection.rb | 240 |
3 files changed, 26 insertions, 246 deletions
diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb index 6dcded2f9..cdde51bee 100644 --- a/lib/puppet/parser/collector.rb +++ b/lib/puppet/parser/collector.rb @@ -14,8 +14,10 @@ class Puppet::Parser::Collector end else method = "collect_#{@form.to_s}" - changer = @form.to_s + "=" - objects = send(method).each { |obj| obj.send(changer, false) } + objects = send(method).each do |obj| + obj.virtual = false + obj.exported = false if form == :exported + end if objects.empty? return false else diff --git a/spec/unit/parser/collector.rb b/spec/unit/parser/collector.rb index caeb2b5a3..72c4c627c 100755 --- a/spec/unit/parser/collector.rb +++ b/spec/unit/parser/collector.rb @@ -228,8 +228,10 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do one = stub 'one', :type => :mytype, :virtual? => true, :exported? => true two = stub 'two', :type => :mytype, :virtual? => true, :exported? => true - one.expects(:exported=).with(false) - two.expects(:exported=).with(false) + one.stubs(:exported=) + one.stubs(:virtual=) + two.stubs(:exported=) + two.stubs(:virtual=) @compile.expects(:resources).returns([one, two]) @@ -242,6 +244,20 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do one = stub 'one', :type => :mytype, :virtual? => true, :exported? => true one.expects(:exported=).with(false) + one.stubs(:virtual=) + + @compile.expects(:resources).returns([one]) + + @collector.evaluate.should == [one] + end + + it "should mark all returned resources as not virtual" do + stub_rails(true) + + one = stub 'one', :type => :mytype, :virtual? => true, :exported? => true + + one.stubs(:exported=) + one.expects(:virtual=).with(false) @compile.expects(:resources).returns([one]) @@ -257,7 +273,8 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do resource = mock 'resource' one.expects(:to_resource).with(@scope).returns(resource) - resource.expects(:exported=).with(false) + resource.stubs(:exported=) + resource.stubs(:virtual=) @compile.stubs(:resources).returns([]) @scope.stubs(:findresource).returns(nil) @@ -276,7 +293,8 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do resource = mock 'resource' one.expects(:to_resource).with(@scope).returns(resource) - resource.expects(:exported=).with(false) + resource.stubs(:exported=) + resource.stubs(:virtual=) @compile.stubs(:resources).returns([]) @scope.stubs(:findresource).returns(nil) diff --git a/test/rails/collection.rb b/test/rails/collection.rb deleted file mode 100755 index d0eecca89..000000000 --- a/test/rails/collection.rb +++ /dev/null @@ -1,240 +0,0 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + '/../lib/puppettest' - -require 'puppet' -require 'puppet/rails' -require 'puppettest' -require 'puppettest/railstesting' -require 'puppettest/resourcetesting' - - -# A separate class for testing rails integration -class TestRailsCollection < PuppetTest::TestCase - confine "Missing rails support" => Puppet.features.rails? - include PuppetTest - include PuppetTest::ParserTesting - include PuppetTest::ResourceTesting - include PuppetTest::RailsTesting - Parser = Puppet::Parser - AST = Parser::AST - - def setup - super - Puppet[:trace] = false - @scope = mkscope - @scope.compile.send(:evaluate_main) - end - - def test_collect_exported - railsinit - - # make an exported resource - exported = mkresource(:type => "file", :title => "/tmp/exported", - :exported => true, :params => {:owner => "root"}) - @scope.compile.store_resource @scope, exported - - assert(exported.exported?, "Object was not marked exported") - assert(exported.virtual?, "Object was not marked virtual") - - # And a non-exported - real = mkresource(:type => "file", :title => "/tmp/real", - :params => {:owner => "root"}) - @scope.compile.store_resource @scope, real - - # Now make a collector - coll = nil - assert_nothing_raised do - coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported) - end - - # Set it in our scope - @scope.compile.add_collection(coll) - - # Make sure it's in the collections - assert_equal([coll], @scope.compile.collections) - - # And try to collect the virtual resources. - ret = nil - assert_nothing_raised do - ret = coll.collect_exported - end - - assert_equal([exported], ret) - - # Now make sure evaluate does the right thing. - assert_nothing_raised do - ret = coll.evaluate - end - - # Make sure that the collection does not find the resource on the - # next run. - ret = nil - assert_nothing_raised do - ret = coll.collect_exported - end - - assert(ret.empty?, "Exported resource was collected on the second run") - - - # And make sure our exported object is no longer exported - assert(! exported.virtual?, "Virtual object did not get realized") - - # But it should still be marked exported. - assert(exported.exported?, "Resource got un-exported") - - # Now make a new collector of a different type and make sure it - # finds nothing. - assert_nothing_raised do - coll = Puppet::Parser::Collector.new(@scope, "exec", nil, nil, :exported) - end - - # Remark this as virtual - exported.virtual = true - - assert_nothing_raised do - ret = coll.evaluate - end - - assert(! ret, "got resources back") - - # Now create a whole new scope and make sure we can actually retrieve - # the resource from the database, not just from the scope. - # First create a host object and store our resource in it. - - # Now collect our facts - facts = {} - Facter.each do |fact, value| facts[fact] = value end - - # Now try storing our crap - # Remark this as exported - exported.exported = true - exported.scope.stubs(:tags).returns([]) - node = mknode(facts["hostname"]) - node.parameters = facts - host = Puppet::Rails::Host.store(node, [exported]) - assert(host, "did not get rails host") - host.save - - # And make sure it's in there - newres = host.resources.find_by_restype_and_title_and_exported("file", "/tmp/exported", true) - assert(newres, "Did not find resource in db") - assert(newres.exported?, "Resource was not exported") - - # Make a new set with a different node name - node = mknode("other") - compile = Puppet::Parser::Compile.new(node, mkparser) - compile.send(:evaluate_main) - compile.topscope.source = mock("source") - - # It's important that it's a different name, since same-name resources are ignored. - assert_equal("other", compile.node.name, "Did not get correct node name") - - # Now make a collector - coll = nil - assert_nothing_raised do - coll = Puppet::Parser::Collector.new(compile.topscope, "file", nil, nil, :exported) - end - - # And try to collect the virtual resources. - ret = nil - assert_nothing_raised("Could not collect exported resources") do - ret = coll.collect_exported - end - - assert_equal(["/tmp/exported"], ret.collect { |f| f.title }, "Did not find resource in collction") - - # Make sure we can evaluate the same collection multiple times and - # that later collections do nothing - assert_nothing_raised("Collection found same resource twice") do - ret = coll.evaluate - end - end - - def test_collection_conflicts - railsinit - - # First make a railshost we can conflict with - host = Puppet::Rails::Host.new(:name => "myhost") - - host.resources.build(:title => "/tmp/conflicttest", :restype => "file", - :exported => true) - - host.save - - # Now make a normal resource - normal = mkresource(:type => "file", :title => "/tmp/conflicttest", - :params => {:owner => "root"}) - @scope.compile.store_resource @scope, normal - - # Now make a collector - coll = nil - assert_nothing_raised do - coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported) - end - - # And try to collect the virtual resources. - assert_raise(Puppet::ParseError) do - ret = coll.collect_exported - end - end - - # Make sure we do not collect resources from the host we're on - def test_no_resources_from_me - railsinit - - # Make our configuration - host = Puppet::Rails::Host.new(:name => @scope.host) - - host.resources.build(:title => "/tmp/hosttest", :restype => "file", - :exported => true) - - host.save - - # Now make a collector - coll = nil - assert_nothing_raised do - coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported) - end - - # And make sure we get nada back - ret = nil - assert_nothing_raised do - ret = coll.collect_exported - end - - assert(ret.empty?, "Found exports from our own host") - end - - # #731 -- we're collecting all resources, not just exported resources. - def test_only_collecting_exported_resources - railsinit - - # Make our configuration - host = Puppet::Rails::Host.new(:name => "myhost") - - host.resources.build(:title => "/tmp/exporttest1", :restype => "file", - :exported => true) - host.resources.build(:title => "/tmp/exporttest2", :restype => "file", - :exported => false) - - host.save - - # Now make a collector - coll = nil - assert_nothing_raised do - coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported) - end - - # And make sure we get nada back - ret = nil - assert_nothing_raised do - ret = coll.collect_exported - end - - names = ret.collect { |res| res.title } - - assert_equal(%w{/tmp/exporttest1}, names, "Collected incorrect resource list") - end -end - |