puppet 3.3.2 → 3.4.0.rc1

data/spec/unit/util/lockfile_spec.rb

@@ -25,7 +25,7 @@ describe Puppet::Util::Lockfile do
     it "should create a lock file" do
       @lock.lock
 
-      File.should be_exists(@lockfile)
+      Puppet::FileSystem::File.exist?(@lockfile).should be_true
     end
 
     it "should create a lock file containing a string" do
@@ -49,7 +49,7 @@ describe Puppet::Util::Lockfile do
     it "should clear the lock file" do
       File.open(@lockfile, 'w') { |fd| fd.print("locked") }
       @lock.unlock
-      File.should_not be_exists(@lockfile)
+      Puppet::FileSystem::File.exist?(@lockfile).should be_false
     end
   end
 

data/spec/unit/util/log/destinations_spec.rb

@@ -108,6 +108,38 @@ describe Puppet::Util::Log.desttypes[:syslog] do
   end
 end
 
+describe Puppet::Util::Log.desttypes[:logstash_event] do
+
+  describe "when using structured log format with logstash_event schema" do
+    before :each do
+      @msg = Puppet::Util::Log.new(:level => :info, :message => "So long, and thanks for all the fish.", :source => "a dolphin")
+    end
+
+    it "format should fix the hash to have the correct structure" do
+      dest = described_class.new
+      result = dest.format(@msg)
+      result["version"].should == 1
+      result["level"].should   == :info
+      result["message"].should == "So long, and thanks for all the fish."
+      result["source"].should  == "a dolphin"
+      # timestamp should be within 10 seconds
+      Time.parse(result["@timestamp"]).should >= ( Time.now - 10 )
+    end
+
+    it "format returns a structure that can be converted to json" do
+      dest = described_class.new
+      hash = dest.format(@msg)
+      JSON.parse(hash.to_json)
+    end
+
+    it "handle should send the output to stdout" do
+      $stdout.expects(:puts).once
+      dest = described_class.new
+      dest.handle(@msg)
+    end
+  end
+end
+
 describe Puppet::Util::Log.desttypes[:console] do
   let (:klass) { Puppet::Util::Log.desttypes[:console] }
 

data/spec/unit/util/monkey_patches_spec.rb

@@ -280,6 +280,47 @@ describe OpenSSL::SSL::SSLContext do
   end
 end
 
+
+describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
+  let(:store) { described_class.new }
+  let(:cert)  { OpenSSL::X509::Certificate.new(File.read(my_fixture('x509.pem'))) }
+
+  def with_root_certs(certs)
+    Puppet::Util::Windows::RootCerts.expects(:instance).returns(certs)
+  end
+
+  it "adds a root cert to the store" do
+    with_root_certs([cert])
+
+    store.set_default_paths
+  end
+
+  it "ignores duplicate root certs" do
+    with_root_certs([cert, cert])
+
+    store.expects(:add_cert).with(cert).once
+
+    store.set_default_paths
+  end
+
+  it "warns when adding a certificate that already exists" do
+    with_root_certs([cert])
+    store.add_cert(cert)
+
+    store.expects(:warn).with('Failed to add /DC=com/DC=microsoft/CN=Microsoft Root Certificate Authority')
+
+    store.set_default_paths
+  end
+
+  it "raises when adding an invalid certificate" do
+    with_root_certs(['notacert'])
+
+    expect {
+      store.set_default_paths
+    }.to raise_error(TypeError)
+  end
+end
+
 describe SecureRandom do
   it 'generates a properly formatted uuid' do
     SecureRandom.uuid.should =~ /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i

data/spec/unit/util/pidlock_spec.rb

@@ -47,7 +47,7 @@ describe Puppet::Util::Pidlock do
 
     it "should create a lock file" do
       @lock.lock
-      File.should be_exists(@lockfile)
+      Puppet::FileSystem::File.exist?(@lockfile).should be_true
     end
 
     it "should expose the lock file_path" do
@@ -74,7 +74,7 @@ describe Puppet::Util::Pidlock do
     it "should get rid of the lock file" do
       @lock.lock
       @lock.unlock
-      File.should_not be_exists(@lockfile)
+      Puppet::FileSystem::File.exist?(@lockfile).should be_false
     end
   end
 
@@ -106,12 +106,12 @@ describe Puppet::Util::Pidlock do
     describe "#lock" do
       it "should clear stale locks" do
         @lock.locked?
-        File.should_not be_exists(@lockfile)
+        Puppet::FileSystem::File.exist?(@lockfile).should be_false
       end
 
       it "should replace with new locks" do
         @lock.lock
-        File.should be_exists(@lockfile)
+        Puppet::FileSystem::File.exist?(@lockfile).should be_true
         @lock.lock_pid.should == 6789
         @lock.should be_mine
         @lock.should be_locked
@@ -125,7 +125,7 @@ describe Puppet::Util::Pidlock do
 
       it "should not remove the lock file" do
         @lock.unlock
-        File.should be_exists(@lockfile)
+        Puppet::FileSystem::File.exist?(@lockfile).should be_true
       end
     end
   end
@@ -170,7 +170,7 @@ describe Puppet::Util::Pidlock do
 
       it "should not remove the lock file" do
         @lock.unlock
-        File.should be_exists(@lockfile)
+        Puppet::FileSystem::File.exist?(@lockfile).should be_true
       end
 
       it "should still not be our lock" do

data/spec/unit/util/rdoc/parser_spec.rb

@@ -13,7 +13,9 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
   include PuppetSpec::Files
 
   before :each do
-    File.stubs(:stat).with("init.pp")
+    stub_file = stub('init.pp', :stat => stub())
+    # Ruby 1.8.7 needs the following call to be stubs and not expects
+    Puppet::FileSystem::File.stubs(:new).with('init.pp').returns stub_file
     @top_level = stub_everything 'toplevel', :file_relative_name => "init.pp"
     @parser = RDoc::Parser.new(@top_level, "module/manifests/init.pp", nil, Options.instance, RDoc::Stats.new)
   end
@@ -82,7 +84,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       File.stubs(:open).returns("readme")
       @parser.stubs(:parse_elements)
 
-      @module.expects(:comment=).with("readme")
+      @module.expects(:add_comment).with("readme", "module/manifests/init.pp")
 
       @parser.scan_top_level(@topcontainer)
     end
@@ -93,7 +95,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       File.stubs(:open).returns("readme")
       @parser.stubs(:parse_elements)
 
-      @module.expects(:comment=).with("readme")
+      @module.expects(:add_comment).with("readme", "module/manifests/init.pp")
 
       @parser.scan_top_level(@topcontainer)
     end
@@ -105,7 +107,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       File.stubs(:open).with("module/README.rdoc", "r").returns("readme.rdoc")
       @parser.stubs(:parse_elements)
 
-      @module.expects(:comment=).with("readme.rdoc")
+      @module.expects(:add_comment).with("readme.rdoc", "module/manifests/init.pp")
 
       @parser.scan_top_level(@topcontainer)
     end
@@ -311,7 +313,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
     end
 
     it "should associate the node documentation to the rdoc node" do
-      @rdoc_node.expects(:comment=).with("mydoc")
+      @rdoc_node.expects(:add_comment).with("mydoc", "file")
       @parser.document_node("mynode", @node, @class)
     end
 
@@ -360,7 +362,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
     end
 
     it "should associate the node documentation to the rdoc class" do
-      @rdoc_class.expects(:comment=).with("mydoc")
+      @rdoc_class.expects(:add_comment).with("mydoc", "file")
       @parser.document_class("mynode", @class, @module)
     end
 
@@ -397,7 +399,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
     before(:each) do
       @class = stub_everything 'class'
       @code = stub_everything 'code'
-      @code.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(true)
+      @code.stubs(:is_a?).with(Puppet::Parser::AST::BlockExpression).returns(true)
     end
 
     it "should also scan mono-instruction code" do
@@ -435,7 +437,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
     before(:each) do
       @class = stub_everything 'class'
       @code = stub_everything 'code'
-      @code.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(true)
+      @code.stubs(:is_a?).with(Puppet::Parser::AST::BlockExpression).returns(true)
     end
 
     it "should also scan mono-instruction code" do
@@ -457,11 +459,11 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       @class = stub_everything 'class'
 
       @stmt = stub_everything 'stmt', :name => "myvar", :value => "myvalue", :doc => "mydoc"
-      @stmt.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(false)
+      @stmt.stubs(:is_a?).with(Puppet::Parser::AST::BlockExpression).returns(false)
       @stmt.stubs(:is_a?).with(Puppet::Parser::AST::VarDef).returns(true)
 
       @code = stub_everything 'code'
-      @code.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(true)
+      @code.stubs(:is_a?).with(Puppet::Parser::AST::BlockExpression).returns(true)
     end
 
     it "should recursively register variables to the current container" do
@@ -483,17 +485,17 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       @class = stub_everything 'class'
       @stmt = Puppet::Parser::AST::Resource.new(
         :type       => "File",
-        :instances  => Puppet::Parser::AST::ASTArray.new(:children => [
+        :instances  => Puppet::Parser::AST::BlockExpression.new(:children => [
           Puppet::Parser::AST::ResourceInstance.new(
             :title => Puppet::Parser::AST::Name.new(:value => "myfile"),
-            :parameters => Puppet::Parser::AST::ASTArray.new(:children => [])
+            :parameters => Puppet::Parser::AST::BlockExpression.new(:children => [])
           )
         ]),
         :doc        => 'mydoc'
       )
 
       @code = stub_everything 'code'
-      @code.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(true)
+      @code.stubs(:is_a?).with(Puppet::Parser::AST::BlockExpression).returns(true)
     end
 
     it "should register a PuppetResource to the current container" do

data/spec/unit/util/rdoc_spec.rb

@@ -5,15 +5,7 @@ require 'puppet/util/rdoc'
 require 'rdoc/rdoc'
 
 describe Puppet::Util::RDoc do
-  it "should fail with a clear error without RDoc 1.*" do
-    Puppet.features.stubs(:rdoc1?).returns(false)
-
-    expect {
-      Puppet::Util::RDoc.rdoc("output", [])
-    }.to raise_error(/the version of RDoc .* is not supported/)
-  end
-
-  describe "when generating RDoc HTML documentation", :if => Puppet.features.rdoc1? do
+  describe "when generating RDoc HTML documentation" do
     before :each do
       @rdoc = stub_everything 'rdoc'
       RDoc::RDoc.stubs(:new).returns(@rdoc)
@@ -24,12 +16,6 @@ describe Puppet::Util::RDoc do
       Puppet::Util::RDoc.rdoc("output", [])
     end
 
-    it "should install the Puppet HTML Generator into RDoc generators" do
-      Puppet::Util::RDoc.rdoc("output", [])
-
-      RDoc::RDoc::GENERATORS["puppet"].file_name.should == "puppet/util/rdoc/generators/puppet_generator.rb"
-    end
-
     it "should tell RDoc to generate documentation using the Puppet generator" do
       @rdoc.expects(:document).with { |args| args.include?("--fmt") and args.include?("puppet") }
 
@@ -48,18 +34,26 @@ describe Puppet::Util::RDoc do
       Puppet::Util::RDoc.rdoc("output", [], "utf-8")
     end
 
-    it "should tell RDoc to force updates of indices when RDoc supports it" do
-      Options::OptionList.stubs(:options).returns([["--force-update", "-U", 0 ]])
-      @rdoc.expects(:document).with { |args| args.include?("--force-update") }
+    describe "with rdoc1", :if => Puppet.features.rdoc1? do
+      it "should install the Puppet HTML Generator into RDoc generators" do
+        Puppet::Util::RDoc.rdoc("output", [])
 
-      Puppet::Util::RDoc.rdoc("output", [])
-    end
+        RDoc::RDoc::GENERATORS["puppet"].file_name.should == "puppet/util/rdoc/generators/puppet_generator.rb"
+      end
 
-    it "should not tell RDoc to force updates of indices when RDoc doesn't support it" do
-      Options::OptionList.stubs(:options).returns([])
-      @rdoc.expects(:document).never.with { |args| args.include?("--force-update") }
+      it "should tell RDoc to force updates of indices when RDoc supports it" do
+        ::Options::OptionList.stubs(:options).returns([["--force-update", "-U", 0 ]])
+        @rdoc.expects(:document).with { |args| args.include?("--force-update") }
 
-      Puppet::Util::RDoc.rdoc("output", [])
+        Puppet::Util::RDoc.rdoc("output", [])
+      end
+
+      it "should not tell RDoc to force updates of indices when RDoc doesn't support it" do
+        ::Options::OptionList.stubs(:options).returns([])
+        @rdoc.expects(:document).never.with { |args| args.include?("--force-update") }
+
+        Puppet::Util::RDoc.rdoc("output", [])
+      end
     end
 
     it "should tell RDoc to use the given outputdir" do

data/spec/unit/util/resource_template_spec.rb

@@ -6,20 +6,20 @@ require 'puppet/util/resource_template'
 describe Puppet::Util::ResourceTemplate do
   describe "when initializing" do
     it "should fail if the template does not exist" do
-      FileTest.expects(:exist?).with("/my/template").returns false
+      Puppet::FileSystem::File.expects(:exist?).with("/my/template").returns false
       lambda { Puppet::Util::ResourceTemplate.new("/my/template", mock('resource')) }.should raise_error(ArgumentError)
     end
 
     it "should not create the ERB template" do
       ERB.expects(:new).never
-      FileTest.expects(:exist?).with("/my/template").returns true
+      Puppet::FileSystem::File.expects(:exist?).with("/my/template").returns true
       Puppet::Util::ResourceTemplate.new("/my/template", mock('resource'))
     end
   end
 
   describe "when evaluating" do
     before do
-      FileTest.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       File.stubs(:read).returns "eh"
 
       @template = stub 'template', :result => nil

data/spec/unit/util/selinux_spec.rb

@@ -123,7 +123,8 @@ describe Puppet::Util::SELinux do
     it "should return a context if a default context exists" do
       self.expects(:selinux_support?).returns true
       fstat = stub 'File::Stat', :mode => 0
-      File.expects(:lstat).with("/foo").returns fstat
+      stub_file = stub('/foo', :lstat => fstat)
+      Puppet::FileSystem::File.expects(:new).with('/foo').returns stub_file
       self.expects(:find_fs).with("/foo").returns "ext3"
       Selinux.expects(:matchpathcon).with("/foo", 0).returns [0, "user_u:role_r:type_t:s0"]
       get_selinux_default_context("/foo").should == "user_u:role_r:type_t:s0"
@@ -150,7 +151,8 @@ describe Puppet::Util::SELinux do
     it "should return nil if matchpathcon returns failure" do
       self.expects(:selinux_support?).returns true
       fstat = stub 'File::Stat', :mode => 0
-      File.expects(:lstat).with("/foo").returns fstat
+      stub_file = stub('/foo', :lstat => fstat)
+      Puppet::FileSystem::File.expects(:new).with('/foo').returns stub_file
       self.expects(:find_fs).with("/foo").returns "ext3"
       Selinux.expects(:matchpathcon).with("/foo", 0).returns -1
       get_selinux_default_context("/foo").should be_nil

data/spec/unit/util/storage_spec.rb

@@ -77,7 +77,7 @@ describe Puppet::Util::Storage do
       end
 
       it "should not fail to load" do
-        FileTest.exists?(@path).should be_false
+        Puppet::FileSystem::File.exist?(@path).should be_false
         Puppet[:statedir] = @path
         Puppet::Util::Storage.load
         Puppet[:statefile] = @path
@@ -85,7 +85,7 @@ describe Puppet::Util::Storage do
       end
 
       it "should not lose its internal state when load() is called" do
-        FileTest.exists?(@path).should be_false
+        Puppet::FileSystem::File.exist?(@path).should be_false
 
         Puppet::Util::Storage.cache(:yayness)
         Puppet::Util::Storage.state.should == {:yayness=>{}}
@@ -176,12 +176,12 @@ describe Puppet::Util::Storage do
     end
 
     it "should create the state file if it does not exist" do
-      FileTest.exists?(Puppet[:statefile]).should be_false
+      Puppet::FileSystem::File.exist?(Puppet[:statefile]).should be_false
       Puppet::Util::Storage.cache(:yayness)
 
       Puppet::Util::Storage.store
 
-      FileTest.exists?(Puppet[:statefile]).should be_true
+      Puppet::FileSystem::File.exist?(Puppet[:statefile]).should be_true
     end
 
     it "should raise an exception if the state file is not a regular file" do

data/spec/unit/util/suidmanager_spec.rb

@@ -231,6 +231,13 @@ describe Puppet::Util::SUIDManager do
         output.first.should == 'output'
         output.last.should be_a(Process::Status)
       end
+
+      it "should log a deprecation notice" do
+        Puppet::Util::Execution.stubs(:execute).returns("success")
+        Puppet.expects(:deprecation_warning).with('Puppet::Util::SUIDManager.run_and_capture is deprecated; please use Puppet::Util::Execution.execute instead.')
+
+        output = Puppet::Util::SUIDManager.run_and_capture 'yay', user[:uid], user[:gid]
+      end
     end
   end
 

data/spec/unit/util/tag_set_spec.rb

@@ -0,0 +1,46 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+
+require 'puppet/util/tag_set'
+
+RSpec::Matchers.define :be_one_of do |*expected|
+  match do |actual|
+    expected.include? actual
+  end
+
+  failure_message_for_should do |actual|
+    "expected #{actual.inspect} to be one of #{expected.map(&:inspect).join(' or ')}"
+  end
+end
+
+describe Puppet::Util::TagSet do
+  let(:set) { Puppet::Util::TagSet.new }
+
+  it 'serializes to yaml as an array' do
+    array = ['a', :b, 1, 5.4]
+    set.merge(array)
+
+    Set.new(YAML.load(set.to_yaml)).should == Set.new(array)
+  end
+
+  it 'deserializes from a yaml array' do
+    array = ['a', :b, 1, 5.4]
+
+    Puppet::Util::TagSet.from_yaml(array.to_yaml).should == Puppet::Util::TagSet.new(array)
+  end
+
+  it 'round trips through pson' do
+    array = ['a', 'b', 1, 5.4]
+    set.merge(array)
+
+    tes = Puppet::Util::TagSet.from_pson(PSON.parse(set.to_pson))
+    tes.should == set
+  end
+
+  it 'can join its elements with a string separator' do
+    array = ['a', 'b']
+    set.merge(array)
+
+    set.join(', ').should be_one_of('a, b', 'b, a')
+  end
+end