puppet 2.7.11 → 2.7.12

data/spec/unit/util/log_spec.rb

@@ -14,6 +14,22 @@ describe Puppet::Util::Log do
     message.should == "foo"
   end
 
+  describe ".setup_default" do
+    it "should default to :syslog" do
+      Puppet.features.stubs(:syslog?).returns(true)
+      Puppet::Util::Log.expects(:newdestination).with(:syslog)
+
+      Puppet::Util::Log.setup_default
+    end
+
+    it "should fall back to :file" do
+      Puppet.features.stubs(:syslog?).returns(false)
+      Puppet::Util::Log.expects(:newdestination).with(Puppet[:puppetdlog])
+
+      Puppet::Util::Log.setup_default
+    end
+  end
+
   describe Puppet::Util::Log::DestConsole do
     before do
       @console = Puppet::Util::Log::DestConsole.new
@@ -34,7 +50,7 @@ describe Puppet::Util::Log do
     it "should htmlize if Puppet[:color] is :html" do
       Puppet[:color] = :html
 
-      @console.colorize(:alert, "abc").should == "<span style=\"color: FFA0A0\">abc</span>"
+      @console.colorize(:alert, "abc").should == "<span style=\"color: #FFA0A0\">abc</span>"
     end
 
     it "should do nothing if Puppet[:color] is false" do

data/spec/unit/util/monkey_patches_spec.rb

@@ -53,3 +53,122 @@ describe "Array#combination" do
     [1,2,3,4].combination(3).to_a.should == [[1, 2, 3], [1, 2, 4], [1, 3, 4], [2, 3, 4]]
   end
 end
+
+describe IO do
+  include PuppetSpec::Files
+
+  let(:file) { tmpfile('io-binary') }
+  let(:content) { "\x01\x02\x03\x04" }
+
+  describe "::binread" do
+    it "should read in binary mode" do
+      File.open(file, 'wb') {|f| f.write(content) }
+      IO.binread(file).should == content
+    end
+
+    it "should read with a length and offset" do
+      offset = 1
+      length = 2
+      File.open(file, 'wb') {|f| f.write(content) }
+      IO.binread(file, length, offset).should == content[offset..length]
+    end
+
+    it "should raise an error if the file doesn't exist" do
+      expect { IO.binread('/path/does/not/exist') }.to raise_error(Errno::ENOENT)
+    end
+  end
+
+  describe "::binwrite" do
+    it "should write in binary mode" do
+      IO.binwrite(file, content).should == content.length
+      File.open(file, 'rb') {|f| f.read.should == content }
+    end
+
+    it "should write using an offset" do
+      offset = 1
+      IO.binwrite(file, content, offset).should == content.length - offset
+      File.open(file, 'rb') {|f| f.read.should == content[offset..-1] }
+    end
+
+    it "should raise an error if the file doesn't exist" do
+      expect { IO.binwrite('/path/does/not/exist', 'foo') }.to raise_error(Errno::ENOENT)
+    end
+  end
+end
+
+describe Range do
+  def do_test( range, other, expected )
+    result = range.intersection(other)
+    result.should == expected
+  end
+
+  it "should return expected ranges for iterable things" do
+    iterable_tests = {
+      1  .. 4   => nil,          # before
+      11 .. 15  => nil,          # after
+      1  .. 6   => 5  ..  6,     # overlap_begin
+      9  .. 15  => 9  ..  10,    # overlap_end
+      1  .. 5   => 5  ..  5,     # overlap_begin_edge
+      10 .. 15  => 10 ..  10,    # overlap_end_edge
+      5  .. 10  => 5  ..  10,    # overlap_all
+      6  .. 9   => 6  ..  9,     # overlap_inner
+
+      1 ... 5   => nil,          # before             (exclusive range)
+      1 ... 7   => 5  ... 7,     # overlap_begin      (exclusive range)
+      1 ... 6   => 5  ... 6,     # overlap_begin_edge (exclusive range)
+      5 ... 11  => 5  ..  10,    # overlap_all        (exclusive range)
+      6 ... 10  => 6  ... 10,    # overlap_inner      (exclusive range)
+    }
+
+    iterable_tests.each do |other, expected|
+      do_test( 5..10, other, expected )
+      do_test( other, 5..10, expected )
+    end
+  end
+
+  it "should return expected ranges for noniterable things" do
+    inclusive_base_case = {
+      1.to_f  .. 4.to_f   => nil,                   # before
+      11.to_f .. 15.to_f  => nil,                   # after
+      1.to_f  .. 6.to_f   => 5.to_f  ..  6.to_f,    # overlap_begin
+      9.to_f  .. 15.to_f  => 9.to_f  ..  10.to_f,   # overlap_end
+      1.to_f  .. 5.to_f   => 5.to_f  ..  5.to_f,    # overlap_begin_edge
+      10.to_f .. 15.to_f  => 10.to_f ..  10.to_f,   # overlap_end_edge
+      5.to_f  .. 10.to_f  => 5.to_f  ..  10.to_f,   # overlap_all
+      6.to_f  .. 9.to_f   => 6.to_f  ..  9.to_f,    # overlap_inner
+
+      1.to_f ... 5.to_f   => nil,                   # before             (exclusive range)
+      1.to_f ... 7.to_f   => 5.to_f  ... 7.to_f,    # overlap_begin      (exclusive range)
+      1.to_f ... 6.to_f   => 5.to_f  ... 6.to_f,    # overlap_begin_edge (exclusive range)
+      5.to_f ... 11.to_f  => 5.to_f  ..  10.to_f,   # overlap_all        (exclusive range)
+      6.to_f ... 10.to_f  => 6.to_f  ... 10.to_f,   # overlap_inner      (exclusive range)
+    }
+
+    inclusive_base_case.each do |other, expected|
+      do_test( 5.to_f..10.to_f, other, expected )
+      do_test( other, 5.to_f..10.to_f, expected )
+    end
+
+    exclusive_base_case = {
+      1.to_f  .. 4.to_f   => nil,                   # before
+      11.to_f .. 15.to_f  => nil,                   # after
+      1.to_f  .. 6.to_f   => 5.to_f  ..  6.to_f,    # overlap_begin
+      9.to_f  .. 15.to_f  => 9.to_f  ... 10.to_f,   # overlap_end
+      1.to_f  .. 5.to_f   => 5.to_f  ..  5.to_f,    # overlap_begin_edge
+      10.to_f .. 15.to_f  => nil,                   # overlap_end_edge
+      5.to_f  .. 10.to_f  => 5.to_f  ... 10.to_f,   # overlap_all
+      6.to_f  .. 9.to_f   => 6.to_f  ..  9.to_f,    # overlap_inner
+
+      1.to_f ... 5.to_f   => nil,                   # before             (exclusive range)
+      1.to_f ... 7.to_f   => 5.to_f  ... 7.to_f,    # overlap_begin      (exclusive range)
+      1.to_f ... 6.to_f   => 5.to_f  ... 6.to_f,    # overlap_begin_edge (exclusive range)
+      5.to_f ... 11.to_f  => 5.to_f  ... 10.to_f,   # overlap_all        (exclusive range)
+      6.to_f ... 10.to_f  => 6.to_f  ... 10.to_f,   # overlap_inner      (exclusive range)
+    }
+
+    exclusive_base_case.each do |other, expected|
+      do_test( 5.to_f...10.to_f, other, expected )
+      do_test( other, 5.to_f...10.to_f, expected )
+    end
+  end
+end

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

@@ -75,7 +75,8 @@ describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do
     end
 
     it "should read any present README as module documentation" do
-      FileTest.stubs(:readable?).returns(true)
+      FileTest.stubs(:readable?).with("module/README").returns(true)
+      FileTest.stubs(:readable?).with("module/README.rdoc").returns(false)
       File.stubs(:open).returns("readme")
       @parser.stubs(:parse_elements)
 
@@ -84,6 +85,29 @@ describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do
       @parser.scan_top_level(@topcontainer)
     end
 
+    it "should read any present README.rdoc as module documentation" do
+      FileTest.stubs(:readable?).with("module/README.rdoc").returns(true)
+      FileTest.stubs(:readable?).with("module/README").returns(false)
+      File.stubs(:open).returns("readme")
+      @parser.stubs(:parse_elements)
+
+      @module.expects(:comment=).with("readme")
+
+      @parser.scan_top_level(@topcontainer)
+    end
+
+    it "should prefer README.rdoc over README as module documentation" do
+      FileTest.stubs(:readable?).with("module/README.rdoc").returns(true)
+      FileTest.stubs(:readable?).with("module/README").returns(true)
+      File.stubs(:open).with("module/README", "r").returns("readme")
+      File.stubs(:open).with("module/README.rdoc", "r").returns("readme.rdoc")
+      @parser.stubs(:parse_elements)
+
+      @module.expects(:comment=).with("readme.rdoc")
+
+      @parser.scan_top_level(@topcontainer)
+    end
+
     it "should tell the container its module name" do
       @parser.stubs(:parse_elements)
 

data/spec/unit/util/selinux_spec.rb

@@ -33,7 +33,7 @@ describe Puppet::Util::SELinux do
     end
   end
 
-  describe "filesystem detection", :'fails_on_ruby_1.9.2' => true do
+  describe "filesystem detection" do
     before :each do
       fh = stub 'fh', :close => nil
       File.stubs(:open).with("/proc/mounts").returns fh
@@ -192,7 +192,7 @@ describe Puppet::Util::SELinux do
     end
   end
 
-  describe "set_selinux_context", :'fails_on_ruby_1.9.2' => true do
+  describe "set_selinux_context" do
     before :each do
       fh = stub 'fh', :close => nil
       File.stubs(:open).with("/proc/mounts").returns fh

data/spec/unit/util/suidmanager_spec.rb

@@ -248,61 +248,16 @@ describe Puppet::Util::SUIDManager do
     end
 
     describe "on Microsoft Windows", :if => Puppet.features.microsoft_windows? do
-      describe "2003 without UAC" do
-        before :each do
-          Facter.stubs(:value).with(:kernelmajversion).returns("5.2")
-        end
-
-        it "should be root if user is a member of the Administrators group" do
-          Sys::Admin.stubs(:get_login).returns("Administrator")
-          Sys::Group.stubs(:members).returns(%w[Administrator])
-
-          Win32::Security.expects(:elevated_security?).never
-          Puppet::Util::SUIDManager.should be_root
-        end
-
-        it "should not be root if the process is running as Guest" do
-          Sys::Admin.stubs(:get_login).returns("Guest")
-          Sys::Group.stubs(:members).returns([])
+      it "should be root if user is privileged" do
+        Puppet::Util::Windows::User.stubs(:admin?).returns true
 
-          Win32::Security.expects(:elevated_security?).never
-          Puppet::Util::SUIDManager.should_not be_root
-        end
-
-        it "should raise an exception if the process fails to open the process token" do
-          Win32::Security.stubs(:elevated_security?).raises(Win32::Security::Error, "Access denied.")
-          Sys::Admin.stubs(:get_login).returns("Administrator")
-          Sys::Group.expects(:members).never
-
-          lambda { Puppet::Util::SUIDManager.should raise_error(Win32::Security::Error, /Access denied./) }
-        end
+        Puppet::Util::SUIDManager.should be_root
       end
 
-      describe "2008 with UAC" do
-        before :each do
-          Facter.stubs(:value).with(:kernelmajversion).returns("6.0")
-        end
-
-        it "should be root if user is running with elevated privileges" do
-          Win32::Security.stubs(:elevated_security?).returns(true)
-          Sys::Admin.expects(:get_login).never
-
-          Puppet::Util::SUIDManager.should be_root
-        end
-
-        it "should not be root if user is not running with elevated privileges" do
-          Win32::Security.stubs(:elevated_security?).returns(false)
-          Sys::Admin.expects(:get_login).never
+      it "should not be root if user is not privileged" do
+        Puppet::Util::Windows::User.stubs(:admin?).returns false
 
-          Puppet::Util::SUIDManager.should_not be_root
-        end
-
-        it "should raise an exception if the process fails to open the process token" do
-          Win32::Security.stubs(:elevated_security?).raises(Win32::Security::Error, "Access denied.")
-          Sys::Admin.expects(:get_login).never
-
-          lambda { Puppet::Util::SUIDManager.should raise_error(Win32::Security::Error, /Access denied./) }
-        end
+        Puppet::Util::SUIDManager.should_not be_root
       end
     end
   end

data/spec/unit/util_spec.rb

@@ -177,8 +177,21 @@ describe Puppet::Util do
 
   describe "execution methods" do
     let(:pid) { 5501 }
+    let(:process_handle) { 0xDEADBEEF }
+    let(:thread_handle) { 0xCAFEBEEF }
+    let(:proc_info_stub) { stub 'processinfo', :process_handle => process_handle, :thread_handle => thread_handle, :process_id => pid}
     let(:null_file) { Puppet.features.microsoft_windows? ? 'NUL' : '/dev/null' }
 
+    def stub_process_wait(exitstatus)
+      if Puppet.features.microsoft_windows?
+        Puppet::Util::Windows::Process.stubs(:wait_process).with(process_handle).returns(exitstatus)
+        Process.stubs(:CloseHandle).with(process_handle)
+        Process.stubs(:CloseHandle).with(thread_handle)
+      else
+        Process.stubs(:waitpid2).with(pid).returns([pid, stub('child_status', :exitstatus => exitstatus)])
+      end
+    end
+
     describe "#execute_posix" do
       before :each do
         # Most of the things this method does are bad to do during specs. :/
@@ -251,12 +264,10 @@ describe Puppet::Util do
       end
     end
 
-    describe "#execute_windows" do
-      let(:proc_info_stub) { stub 'processinfo', :process_id => pid }
-
+    describe "#execute_windows", :if => Puppet.features.microsoft_windows? do
       before :each do
         Process.stubs(:create).returns(proc_info_stub)
-        Process.stubs(:waitpid2).with(pid).returns([pid, process_status(0)])
+        stub_process_wait(0)
 
         @stdin  = File.open(null_file, 'r')
         @stdout = Tempfile.new('stdout')
@@ -266,14 +277,15 @@ describe Puppet::Util do
       it "should create a new process for the command" do
         Process.expects(:create).with(
           :command_line => "test command",
-          :startup_info => {:stdin => @stdin, :stdout => @stdout, :stderr => @stderr}
+          :startup_info => {:stdin => @stdin, :stdout => @stdout, :stderr => @stderr},
+          :close_handles => false
         ).returns(proc_info_stub)
 
         Puppet::Util.execute_windows('test command', {}, @stdin, @stdout, @stderr)
       end
 
-      it "should return the pid of the child process" do
-        Puppet::Util.execute_windows('test command', {}, @stdin, @stdout, @stderr).should == pid
+      it "should return the process info of the child process" do
+        Puppet::Util.execute_windows('test command', {}, @stdin, @stdout, @stderr).should == proc_info_stub
       end
 
       it "should quote arguments containing spaces if command is specified as an array" do
@@ -287,7 +299,7 @@ describe Puppet::Util do
 
     describe "#execute" do
       before :each do
-        Process.stubs(:waitpid2).with(pid).returns([pid, process_status(0)])
+        stub_process_wait(0)
       end
 
       describe "when an execution stub is specified" do
@@ -312,6 +324,7 @@ describe Puppet::Util do
       describe "when setting up input and output files" do
         include PuppetSpec::Files
         let(:executor) { Puppet.features.microsoft_windows? ? 'execute_windows' : 'execute_posix' }
+        let(:rval) { Puppet.features.microsoft_windows? ? proc_info_stub : pid }
 
         before :each do
           Puppet::Util.stubs(:wait_for_output)
@@ -323,7 +336,7 @@ describe Puppet::Util do
 
           Puppet::Util.expects(executor).with do |_,_,stdin,_,_|
             stdin.path == input
-          end.returns(pid)
+          end.returns(rval)
 
           Puppet::Util.execute('test command', :stdinfile => input)
         end
@@ -331,7 +344,7 @@ describe Puppet::Util do
         it "should set stdin to the null file if not specified" do
           Puppet::Util.expects(executor).with do |_,_,stdin,_,_|
             stdin.path == null_file
-          end.returns(pid)
+          end.returns(rval)
 
           Puppet::Util.execute('test command')
         end
@@ -340,7 +353,7 @@ describe Puppet::Util do
           it "should set stdout and stderr to the null file" do
             Puppet::Util.expects(executor).with do |_,_,_,stdout,stderr|
               stdout.path == null_file and stderr.path == null_file
-            end.returns(pid)
+            end.returns(rval)
 
             Puppet::Util.execute('test command', :squelch => true)
           end
@@ -353,7 +366,7 @@ describe Puppet::Util do
 
             Puppet::Util.expects(executor).with do |_,_,_,stdout,_|
               stdout.path == outfile.path
-            end.returns(pid)
+            end.returns(rval)
 
             Puppet::Util.execute('test command', :squelch => false)
           end
@@ -364,7 +377,7 @@ describe Puppet::Util do
 
             Puppet::Util.expects(executor).with do |_,_,_,stdout,stderr|
               stdout.path == outfile.path and stderr.path == outfile.path
-            end.returns(pid)
+            end.returns(rval)
 
             Puppet::Util.execute('test command', :squelch => false, :combine => true)
           end
@@ -375,28 +388,40 @@ describe Puppet::Util do
 
             Puppet::Util.expects(executor).with do |_,_,_,stdout,stderr|
               stdout.path == outfile.path and stderr.path == null_file
-            end.returns(pid)
+            end.returns(rval)
 
             Puppet::Util.execute('test command', :squelch => false, :combine => false)
           end
         end
       end
+
+      describe "on Windows", :if => Puppet.features.microsoft_windows? do
+        it "should always close the process and thread handles" do
+          Puppet::Util.stubs(:execute_windows).returns(proc_info_stub)
+
+          Puppet::Util::Windows::Process.expects(:wait_process).with(process_handle).raises('whatever')
+          Process.expects(:CloseHandle).with(thread_handle)
+          Process.expects(:CloseHandle).with(process_handle)
+
+          expect { Puppet::Util.execute('test command') }.should raise_error(RuntimeError)
+        end
+      end
     end
 
     describe "after execution" do
-      let(:executor) { Puppet.features.microsoft_windows? ? 'execute_windows' : 'execute_posix' }
-
       before :each do
-        Process.stubs(:waitpid2).with(pid).returns([pid, process_status(0)])
+        stub_process_wait(0)
 
-        Puppet::Util.stubs(executor).returns(pid)
+        if Puppet.features.microsoft_windows?
+          Puppet::Util.stubs(:execute_windows).returns(proc_info_stub)
+        else
+          Puppet::Util.stubs(:execute_posix).returns(pid)
+        end
       end
 
       it "should wait for the child process to exit" do
         Puppet::Util.stubs(:wait_for_output)
 
-        Process.expects(:waitpid2).with(pid).returns([pid, process_status(0)])
-
         Puppet::Util.execute('test command')
       end
 
@@ -441,7 +466,7 @@ describe Puppet::Util do
       end
 
       it "should raise an error if failonfail is true and the child failed" do
-        Process.expects(:waitpid2).with(pid).returns([pid, process_status(1)])
+        stub_process_wait(1)
 
         expect {
           Puppet::Util.execute('fail command', :failonfail => true)
@@ -449,7 +474,7 @@ describe Puppet::Util do
       end
 
       it "should not raise an error if failonfail is false and the child failed" do
-        Process.expects(:waitpid2).with(pid).returns([pid, process_status(1)])
+        stub_process_wait(1)
 
         expect {
           Puppet::Util.execute('fail command', :failonfail => false)
@@ -457,8 +482,6 @@ describe Puppet::Util do
       end
 
       it "should not raise an error if failonfail is true and the child succeeded" do
-        Process.expects(:waitpid2).with(pid).returns([pid, process_status(0)])
-
         expect {
           Puppet::Util.execute('fail command', :failonfail => true)
         }.not_to raise_error
@@ -466,6 +489,41 @@ describe Puppet::Util do
     end
   end
 
+  describe "#execpipe" do
+    let :instance do
+      instance = Class.new.new
+      instance.send(:extend, Puppet::Util)
+      instance
+    end
+
+    it "should execute a string as a string" do
+      instance.expects(:open).with('| echo hello 2>&1').returns('hello')
+      $CHILD_STATUS.expects(:==).with(0).returns(true)
+      instance.execpipe('echo hello').should == 'hello'
+    end
+
+    it "should execute an array by pasting together with spaces" do
+      instance.expects(:open).with('| echo hello 2>&1').returns('hello')
+      $CHILD_STATUS.expects(:==).with(0).returns(true)
+      instance.execpipe(['echo', 'hello']).should == 'hello'
+    end
+
+    it "should fail if asked to fail, and the child does" do
+      instance.stubs(:open).returns('error message')
+      $CHILD_STATUS.expects(:==).with(0).returns(false)
+      expect { instance.execpipe('echo hello') }.
+        to raise_error Puppet::ExecutionFailure, /error message/
+    end
+
+    it "should not fail if asked not to fail, and the child does" do
+      instance.stubs(:open).returns('error message')
+      $CHILD_STATUS.stubs(:==).with(0).returns(false)
+      expect do
+        instance.execpipe('echo hello', false).should == 'error message'
+      end.not_to raise_error
+    end
+  end
+
   describe "#which" do
     let(:base) { File.expand_path('/bin') }
     let(:path) { File.join(base, 'foo') }