puppet 2.6.0 → 2.6.1

data/spec/unit/application/apply_spec.rb

@@ -3,6 +3,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/application/apply'
+require 'puppet/file_bucket/dipper'
 
 describe Puppet::Application::Apply do
   before :each do
@@ -53,7 +54,6 @@ describe Puppet::Application::Apply do
       Puppet.stubs(:trap)
       Puppet::Log.stubs(:level=)
       Puppet.stubs(:parse_config)
-      require 'lib/puppet/file_bucket/dipper'
       Puppet::FileBucket::Dipper.stubs(:new)
       STDIN.stubs(:read)
 
@@ -212,7 +212,8 @@ describe Puppet::Application::Apply do
         @apply.main
       end
 
-      it "should set the manifest if some files are passed on command line" do
+      it "should set the manifest if a file is passed on command line and the file exists" do
+        File.stubs(:exist?).with('site.pp').returns true
         @apply.command_line.stubs(:args).returns(['site.pp'])
 
         Puppet.expects(:[]=).with(:manifest,"site.pp")
@@ -220,6 +221,23 @@ describe Puppet::Application::Apply do
         @apply.main
       end
 
+      it "should raise an error if a file is passed on command line and the file does not exist" do
+        File.stubs(:exist?).with('noexist.pp').returns false
+        @apply.command_line.stubs(:args).returns(['noexist.pp'])
+        lambda { @apply.main }.should raise_error(RuntimeError, 'Could not find file noexist.pp')
+      end
+
+      it "should set the manifest to the first file and warn other files will be skipped" do
+        File.stubs(:exist?).with('starwarsIV').returns true
+        File.expects(:exist?).with('starwarsI').never
+        @apply.command_line.stubs(:args).returns(['starwarsIV', 'starwarsI', 'starwarsII'])
+
+        Puppet.expects(:[]=).with(:manifest,"starwarsIV")
+        Puppet.expects(:warning).with('Only one file can be applied per run.  Skipping starwarsI, starwarsII')
+
+        @apply.main
+      end
+
       it "should collect the node facts" do
         Puppet::Node::Facts.expects(:find).returns(@facts)
 
@@ -232,7 +250,7 @@ describe Puppet::Application::Apply do
         lambda { @apply.main }.should raise_error
       end
 
-      it "should find the node" do
+      it "should look for the node" do
         Puppet::Node.expects(:find).returns(@node)
 
         @apply.main
@@ -294,7 +312,7 @@ describe Puppet::Application::Apply do
       end
 
       it "should apply the catalog" do
-        @catalog.expects(:apply)
+        @catalog.expects(:apply).returns(stub_everything 'transaction')
 
         @apply.main
       end

data/spec/unit/application/cert_spec.rb

@@ -12,7 +12,7 @@ describe Puppet::Application::Cert do
   end
 
   it "should operate in master run_mode" do
-    @cert_app.class.run_mode.name.should equal :master
+    @cert_app.class.run_mode.name.should equal(:master)
   end
 
   it "should ask Puppet::Application to parse Puppet configuration file" do

data/spec/unit/application/doc_spec.rb

@@ -27,10 +27,6 @@ describe Puppet::Application::Doc do
     @doc.should respond_to(:rdoc)
   end
 
-  it "should declare a trac command" do
-    @doc.should respond_to(:trac)
-  end
-
   it "should declare a fallback for unknown options" do
     @doc.should respond_to(:handle_unknown)
   end
@@ -270,21 +266,6 @@ describe Puppet::Application::Doc do
   end
 
   describe "when running" do
-    before :each do
-    end
-
-    describe "in trac mode" do
-      it "should call trac for each reference" do
-        ref = stub 'ref'
-        Puppet::Util::Reference.stubs(:reference).with(:ref).returns(ref)
-        @doc.options.stubs(:[]).with(:references).returns([:ref])
-        @doc.options.stubs(:[]).with(:mode).returns(:trac)
-
-        ref.expects(:trac)
-
-        @doc.trac
-      end
-    end
 
     describe "in rdoc mode" do
       before :each do

data/spec/unit/application/master_spec.rb

@@ -23,7 +23,7 @@ describe Puppet::Application::Master do
   end
 
   it "should operate in master run_mode" do
-    @master.class.run_mode.name.should equal :master
+    @master.class.run_mode.name.should equal(:master)
   end
 
   it "should ask Puppet::Application to parse Puppet configuration file" do

data/spec/unit/application_spec.rb

@@ -194,7 +194,6 @@ describe Puppet::Application do
     it "should create a new option parser when needed" do
       option_parser = stub "option parser"
       option_parser.stubs(:on)
-      option_parser.stubs(:default_argv=)
       OptionParser.expects(:new).returns(option_parser).once
       @app.option_parser.should == option_parser
       @app.option_parser.should == option_parser
@@ -203,7 +202,6 @@ describe Puppet::Application do
     it "should pass the banner to the option parser" do
       option_parser = stub "option parser"
       option_parser.stubs(:on)
-      option_parser.stubs(:default_argv=)
       @app.class.instance_eval do
         banner "banner"
       end
@@ -213,15 +211,6 @@ describe Puppet::Application do
       @app.option_parser
     end
 
-    it "should set the optionparser's args to the command line args" do
-      option_parser = stub "option parser"
-      option_parser.stubs(:on)
-      option_parser.expects(:default_argv=).with(%w{ fake args })
-      @app.command_line.stubs(:args).returns(%w{ fake args })
-      OptionParser.expects(:new).returns(option_parser)
-      @app.option_parser
-    end
-
     it "should get options from Puppet.settings.optparse_addargs" do
       Puppet.settings.expects(:optparse_addargs).returns([])
 
@@ -237,7 +226,8 @@ describe Puppet::Application do
     end
 
     it "should ask OptionParser to parse the command-line argument" do
-      @app.option_parser.expects(:parse!)
+      @app.command_line.stubs(:args).returns(%w{ fake args })
+      @app.option_parser.expects(:parse!).with(%w{ fake args })
 
       @app.parse_options
     end

data/spec/unit/indirector/node/ldap_spec.rb

@@ -5,10 +5,6 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/indirector/node/ldap'
 
 describe Puppet::Node::Ldap do
-  before do
-    Puppet::Node::Facts.stubs(:terminus_class).returns :yaml
-  end
-
   describe "when searching for a single node" do
     before :each do
       @searcher = Puppet::Node::Ldap.new
@@ -23,17 +19,17 @@ describe Puppet::Node::Ldap do
     end
 
     it "should convert the hostname into a search filter" do
-      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {"environment" => 'production'}
+      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {}
       @searcher.expects(:ldapsearch).with("(&(objectclass=puppetClient)(cn=#{@name}))").yields entry
-      @searcher.name2hash(@name, 'production', 'parent')
+      @searcher.name2hash(@name)
     end
 
     it "should convert any found entry into a hash" do
-      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {"environment" => 'production'}
+      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {}
       @searcher.expects(:ldapsearch).with("(&(objectclass=puppetClient)(cn=#{@name}))").yields entry
-      myhash = {"myhash" => true, :environment => 'production'}
+      myhash = {"myhash" => true}
       @searcher.expects(:entry2hash).with(entry).returns myhash
-      @searcher.name2hash(@name, 'production', 'parent').should == myhash
+      @searcher.name2hash(@name).should == myhash
     end
 
     # This heavily tests our entry2hash method, so we don't have to stub out the stupid entry information any more.
@@ -128,20 +124,20 @@ describe Puppet::Node::Ldap do
     end
 
     it "should search first for the provided key" do
-      @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns({})
+      @searcher.expects(:name2hash).with("mynode.domain.com").returns({})
       @searcher.find(@request)
     end
 
     it "should search for the short version of the provided key if the key looks like a hostname and no results are found for the key itself" do
-      @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns(nil)
-      @searcher.expects(:name2hash).with("mynode", 'production', 'child').returns({})
+      @searcher.expects(:name2hash).with("mynode.domain.com").returns(nil)
+      @searcher.expects(:name2hash).with("mynode").returns({})
       @searcher.find(@request)
     end
 
     it "should search for default information if no information can be found for the key" do
-      @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns(nil)
-      @searcher.expects(:name2hash).with("mynode", 'production', 'child').returns(nil)
-      @searcher.expects(:name2hash).with("default", 'production', 'child').returns({})
+      @searcher.expects(:name2hash).with("mynode.domain.com").returns(nil)
+      @searcher.expects(:name2hash).with("mynode").returns(nil)
+      @searcher.expects(:name2hash).with("default").returns({})
       @searcher.find(@request)
     end
 
@@ -162,8 +158,8 @@ describe Puppet::Node::Ldap do
       end
 
       it "should create the node with the correct name, even if it was found by a different name" do
-        @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns nil
-        @searcher.expects(:name2hash).with("mynode", 'production', 'child').returns @result
+        @searcher.expects(:name2hash).with("mynode.domain.com").returns nil
+        @searcher.expects(:name2hash).with("mynode").returns @result
 
         Puppet::Node.expects(:new).with("mynode.domain.com").returns @node
         @searcher.find(@request)
@@ -213,15 +209,17 @@ describe Puppet::Node::Ldap do
           @parent = {:classes => [], :parameters => {}}
           @parent_parent = {:classes => [], :parameters => {}}
 
-          @searcher.stubs(:name2hash).with{|name, env, mode| name == @name}.returns(@entry)
-          @searcher.stubs(:name2hash).with{|name, env, mode| name == 'parent'}.returns(@parent)
-          @searcher.stubs(:name2hash).with{|name, env, mode| name == 'parent_parent'}.returns(@parent_parent)
+          @searcher.stubs(:name2hash).with(@name).returns(@entry)
+          @searcher.stubs(:name2hash).with('parent').returns(@parent)
+          @searcher.stubs(:name2hash).with('parent_parent').returns(@parent_parent)
 
           @searcher.stubs(:parent_attribute).returns(:parent)
         end
 
         it "should search for the parent node" do
           @entry[:parent] = "parent"
+          @searcher.expects(:name2hash).with(@name).returns @entry
+          @searcher.expects(:name2hash).with('parent').returns @parent
 
           @searcher.find(@request)
         end
@@ -229,7 +227,7 @@ describe Puppet::Node::Ldap do
         it "should fail if the parent cannot be found" do
           @entry[:parent] = "parent"
 
-          @searcher.expects(:name2hash).with('parent', 'production', 'parent').returns nil
+          @searcher.expects(:name2hash).with('parent').returns nil
 
           proc { @searcher.find(@request) }.should raise_error(Puppet::Error)
         end

data/spec/unit/indirector/yaml_spec.rb

@@ -40,6 +40,18 @@ describe Puppet::Indirector::Yaml, " when choosing file location" do
       @store.path(:me).should =~ %r{^/client/yaml/dir}
     end
 
+    it "should use the extension if one is specified" do
+      Puppet.run_mode.expects(:master?).returns true
+      Puppet.settings.expects(:value).with(:yamldir).returns "/server/yaml/dir"
+      @store.path(:me,'.farfignewton').should =~ %r{\.farfignewton$}
+    end
+
+    it "should assume an extension of .yaml if none is specified" do
+      Puppet.run_mode.expects(:master?).returns true
+      Puppet.settings.expects(:value).with(:yamldir).returns "/server/yaml/dir"
+      @store.path(:me).should =~ %r{\.yaml$}
+    end
+
     it "should store all files in a single file root set in the Puppet defaults" do
       @store.path(:me).should =~ %r{^#{@dir}}
     end
@@ -120,8 +132,8 @@ describe Puppet::Indirector::Yaml, " when choosing file location" do
       @request = stub 'request', :key => "*", :instance => @subject
       @one = mock 'one'
       @two = mock 'two'
-      @store.expects(:base).returns "/my/yaml/dir"
-      Dir.expects(:glob).with(File.join("/my/yaml/dir", @store.class.indirection_name.to_s, @request.key)).returns(%w{one.yaml two.yaml})
+      @store.expects(:path).with(@request.key,'').returns :glob
+      Dir.expects(:glob).with(:glob).returns(%w{one.yaml two.yaml})
       YAML.expects(:load_file).with("one.yaml").returns @one;
       YAML.expects(:load_file).with("two.yaml").returns @two;
       @store.search(@request).should == [@one, @two]
@@ -130,16 +142,16 @@ describe Puppet::Indirector::Yaml, " when choosing file location" do
     it "should return an array containing a single instance of fact when globbing 'one*'" do
       @request = stub 'request', :key => "one*", :instance => @subject
       @one = mock 'one'
-      @store.expects(:base).returns "/my/yaml/dir"
-      Dir.expects(:glob).with(File.join("/my/yaml/dir", @store.class.indirection_name.to_s, @request.key)).returns(%w{one.yaml})
+      @store.expects(:path).with(@request.key,'').returns :glob
+      Dir.expects(:glob).with(:glob).returns(%w{one.yaml})
       YAML.expects(:load_file).with("one.yaml").returns @one;
       @store.search(@request).should == [@one]
     end
 
     it "should return an empty array when the glob doesn't match anything" do
       @request = stub 'request', :key => "f*ilglobcanfail*", :instance => @subject
-      @store.expects(:base).returns "/my/yaml/dir"
-      Dir.expects(:glob).with(File.join("/my/yaml/dir", @store.class.indirection_name.to_s, @request.key)).returns([])
+      @store.expects(:path).with(@request.key,'').returns :glob
+      Dir.expects(:glob).with(:glob).returns []
       @store.search(@request).should == []
     end
   end

data/spec/unit/network/http/rack/rest_spec.rb

@@ -82,8 +82,8 @@ describe "Puppet::Network::HTTP::RackREST" do
           @file.stubs(:is_a?).with(File).returns(true)
         end
 
-        it "should set the Content-Length header" do
-          @response.expects(:[]=).with("Content-Length", 100)
+        it "should set the Content-Length header as a string" do
+          @response.expects(:[]=).with("Content-Length", '100')
 
           @handler.set_response(@response, @file, 200)
         end
@@ -246,4 +246,4 @@ describe Puppet::Network::HTTP::RackREST::RackFile do
     @file.expects(:close)
     @rackfile.close
   end
-end
+end

data/spec/unit/network/http/webrick/rest_spec.rb

@@ -2,6 +2,7 @@
 
 require File.dirname(__FILE__) + '/../../../../spec_helper'
 require 'puppet/network/http'
+require 'webrick'
 require 'puppet/network/http/webrick/rest'
 
 describe Puppet::Network::HTTP::WEBrickREST do

data/spec/unit/node/environment_spec.rb

@@ -53,6 +53,7 @@ describe Puppet::Node::Environment do
       @env = Puppet::Node::Environment.new("dev")
       @collection = Puppet::Resource::TypeCollection.new(@env)
       @collection.stubs(:perform_initial_import)
+      Thread.current[:known_resource_types] = nil
     end
 
     it "should create a resource type collection if none exists" do
@@ -71,13 +72,41 @@ describe Puppet::Node::Environment do
       @env.known_resource_types
     end
 
-    it "should create and return a new collection rather than returning a stale collection" do
-      @env.known_resource_types.expects(:stale?).returns true
+    it "should return the same collection even if stale if it's the same thread" do
+      Puppet::Resource::TypeCollection.stubs(:new).returns @collection
+      @env.known_resource_types.stubs(:stale?).returns true
 
-      Puppet::Resource::TypeCollection.expects(:new).returns @collection
+      @env.known_resource_types.should equal(@collection)
+    end
+
+    it "should return the current thread associated collection if there is one" do
+      Thread.current[:known_resource_types] = @collection
 
       @env.known_resource_types.should equal(@collection)
     end
+
+    it "should give to all threads the same collection if it didn't change" do
+      Puppet::Resource::TypeCollection.expects(:new).with(@env).returns @collection
+      @env.known_resource_types
+
+      t = Thread.new {
+        @env.known_resource_types.should equal(@collection)
+      }
+      t.join
+    end
+
+    it "should give to new threads a new collection if it isn't stale" do
+      Puppet::Resource::TypeCollection.expects(:new).with(@env).returns @collection
+      @env.known_resource_types.expects(:stale?).returns(true)
+
+      Puppet::Resource::TypeCollection.expects(:new).returns @collection
+
+      t = Thread.new {
+        @env.known_resource_types.should equal(@collection)
+      }
+      t.join
+    end
+
   end
 
   [:modulepath, :manifestdir].each do |setting|

data/spec/unit/node/facts_spec.rb

@@ -88,9 +88,20 @@ describe Puppet::Node::Facts, "when indirecting" do
       @facts.save
     end
 
-    it "should default to the 'facter' terminus" do
-      Puppet::Node::Facts.indirection.terminus_class.should == :facter
+    describe "when the Puppet application is 'master'" do
+      it "should default to the 'yaml' terminus" do
+        pending "Cannot test the behavior of defaults in defaults.rb"
+        # Puppet::Node::Facts.indirection.terminus_class.should == :yaml
+      end
     end
+
+    describe "when the Puppet application is not 'master'" do
+      it "should default to the 'facter' terminus" do
+        pending "Cannot test the behavior of defaults in defaults.rb"
+        # Puppet::Node::Facts.indirection.terminus_class.should == :facter
+      end
+    end
+
   end
 
   describe "when storing and retrieving" do

data/spec/unit/parameter/value_collection_spec.rb

@@ -68,12 +68,12 @@ describe Puppet::Parameter::ValueCollection do
 
   it "should correctly generate documentation for values" do
     @collection.newvalues :foo
-    @collection.doc.should be_include("Valid values are ``foo``")
+    @collection.doc.should be_include("Valid values are `foo`")
   end
 
   it "should correctly generate documentation for regexes" do
     @collection.newvalues %r{\w+}
-    @collection.doc.should be_include("Values can match ``/\\w+/``")
+    @collection.doc.should be_include("Values can match `/\\w+/`")
   end
 
   it "should be able to find the first matching value" do

data/spec/unit/parser/ast/leaf_spec.rb

@@ -47,6 +47,10 @@ describe Puppet::Parser::AST::String do
       value = stub 'value', :is_a? => true, :to_s => "ab"
       Puppet::Parser::AST::String.new( :value => value ).to_s.should == "\"ab\""
     end
+    it "should return a dup of its value" do
+      value = ""
+      Puppet::Parser::AST::String.new( :value => value ).evaluate(stub 'scope').should_not be_equal(value)
+    end
   end
 end
 

data/spec/unit/parser/ast/resource_reference_spec.rb

@@ -32,11 +32,6 @@ describe Puppet::Parser::AST::ResourceReference do
     ]
   end
 
-  it "should pass its scope's namespaces to all created resource references" do
-    @scope.add_namespace "foo"
-    newref("File", "/tmp/yay").evaluate(@scope).namespaces.should == ["foo"]
-  end
-
   it "should return a correct representation when converting to string" do
     type = stub 'type', :is_a? => true, :to_s => "file"
     title = stub 'title', :is_a? => true, :to_s => "[/tmp/a, /tmp/b]"