puppet 3.3.2 → 3.4.0.rc1

data/spec/unit/util/autoload_spec.rb

@@ -71,7 +71,7 @@ describe Puppet::Util::Autoload do
 
     [RuntimeError, LoadError, SyntaxError].each do |error|
       it "should die with Puppet::Error if a #{error.to_s} exception is thrown" do
-        File.stubs(:exist?).returns true
+        Puppet::FileSystem::File.stubs(:exist?).returns true
 
         Kernel.expects(:load).raises error
 
@@ -84,7 +84,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should register loaded files with the autoloader" do
-      File.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
 
@@ -94,7 +94,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should be seen by loaded? on the instance using the short name" do
-      File.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
 
@@ -104,7 +104,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should register loaded files with the main loaded file list so they are not reloaded by ruby" do
-      File.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       Kernel.stubs(:load)
 
       @autoload.load("myfile")
@@ -117,7 +117,7 @@ describe Puppet::Util::Autoload do
     it "should load the first file in the searchpath" do
       @autoload.stubs(:search_directories).returns [make_absolute("/a"), make_absolute("/b")]
       FileTest.stubs(:directory?).returns true
-      File.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       Kernel.expects(:load).with(make_absolute("/a/tmp/myfile.rb"), optionally(anything))
 
       @autoload.load("myfile")
@@ -126,7 +126,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should treat equivalent paths to a loaded file as loaded" do
-      File.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
 
@@ -144,7 +144,7 @@ describe Puppet::Util::Autoload do
       @autoload.class.stubs(:search_directories).returns [make_absolute("/a")]
       FileTest.stubs(:directory?).returns true
       Dir.stubs(:glob).returns [make_absolute("/a/foo/file.rb")]
-      File.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       @time_a = Time.utc(2010, 'jan', 1, 6, 30)
       File.stubs(:mtime).returns @time_a
 
@@ -185,7 +185,7 @@ describe Puppet::Util::Autoload do
 
     it "changes should be seen by changed? on the instance using the short name" do
       File.stubs(:mtime).returns(@first_time)
-      File.stubs(:exist?).returns true
+      Puppet::FileSystem::File.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
       @autoload.loaded?("myfile").should be
@@ -206,14 +206,14 @@ describe Puppet::Util::Autoload do
 
       it "should reload if mtime changes" do
         File.stubs(:mtime).with(@file_a).returns(@first_time + 60)
-        File.stubs(:exist?).with(@file_a).returns true
+        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns true
         Kernel.expects(:load).with(@file_a, optionally(anything))
         @autoload.class.reload_changed
       end
 
       it "should do nothing if the file is deleted" do
         File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
-        File.stubs(:exist?).with(@file_a).returns false
+        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns false
         Kernel.expects(:load).never
         @autoload.class.reload_changed
       end
@@ -228,8 +228,8 @@ describe Puppet::Util::Autoload do
         File.expects(:mtime).with(@file_a).returns(@first_time)
         @autoload.class.mark_loaded("file", @file_a)
         File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
-        File.stubs(:exist?).with(@file_a).returns false
-        File.stubs(:exist?).with(@file_b).returns true
+        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns false
+        Puppet::FileSystem::File.stubs(:exist?).with(@file_b).returns true
         File.stubs(:mtime).with(@file_b).returns @first_time
         Kernel.expects(:load).with(@file_b, optionally(anything))
         @autoload.class.reload_changed
@@ -238,11 +238,11 @@ describe Puppet::Util::Autoload do
 
       it "should load a/file when b/file is loaded and a/file is created" do
         File.stubs(:mtime).with(@file_b).returns @first_time
-        File.stubs(:exist?).with(@file_b).returns true
+        Puppet::FileSystem::File.stubs(:exist?).with(@file_b).returns true
         @autoload.class.mark_loaded("file", @file_b)
 
         File.stubs(:mtime).with(@file_a).returns @first_time
-        File.stubs(:exist?).with(@file_a).returns true
+        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns true
         Kernel.expects(:load).with(@file_a, optionally(anything))
         @autoload.class.reload_changed
         @autoload.class.send(:loaded)["file"].should == [@file_a, @first_time]

data/spec/unit/util/backups_spec.rb

@@ -20,7 +20,7 @@ describe Puppet::Util::Backups do
       file = Puppet::Type.type(:file).new(:name => path)
 
       file.expects(:bucket).never
-      FileTest.expects(:exists?).with(path).returns false
+      Puppet::FileSystem::File.expects(:exist?).with(path).returns false
 
       file.perform_backup
     end
@@ -29,23 +29,25 @@ describe Puppet::Util::Backups do
       file = Puppet::Type.type(:file).new(:name => path, :backup => false)
 
       file.expects(:bucket).never
-      FileTest.expects(:exists?).never
+      Puppet::FileSystem::File.expects(:exist?).never
 
       file.perform_backup
     end
 
     it "a bucket should be used when provided" do
-      File.stubs(:lstat).with(path).returns(mock('lstat', :ftype => 'file'))
+      stub_file = stub(path, :lstat => mock('lstat', :ftype => 'file'))
+      Puppet::FileSystem::File.expects(:new).with(path).returns stub_file
       bucket.expects(:backup).with(path).returns("mysum")
-      FileTest.expects(:exists?).with(path).returns(true)
+      Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
 
       file.perform_backup
     end
 
     it "should propagate any exceptions encountered when backing up to a filebucket" do
-      File.stubs(:lstat).with(path).returns(mock('lstat', :ftype => 'file'))
+      stub_file = stub(path, :lstat => mock('lstat', :ftype => 'file'))
+      Puppet::FileSystem::File.expects(:new).with(path).returns stub_file
       bucket.expects(:backup).raises ArgumentError
-      FileTest.expects(:exists?).with(path).returns(true)
+      Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
 
       lambda { file.perform_backup }.should raise_error(ArgumentError)
     end
@@ -56,35 +58,39 @@ describe Puppet::Util::Backups do
       let(:file) { Puppet::Type.type(:file).new(:name => path, :backup => '.'+ext) }
 
       it "should remove any local backup if one exists" do
-        File.expects(:lstat).with(backup).returns stub("stat", :ftype => "file")
-        File.expects(:unlink).with(backup)
+        stub_file = stub(backup, :lstat => stub('stat', :ftype => 'file'))
+        Puppet::FileSystem::File.expects(:new).with(backup).returns stub_file
+        Puppet::FileSystem::File.expects(:unlink).with(backup)
         FileUtils.stubs(:cp_r)
-        FileTest.expects(:exists?).with(path).returns(true)
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
 
         file.perform_backup
       end
 
       it "should fail when the old backup can't be removed" do
-        File.expects(:lstat).with(backup).returns stub("stat", :ftype => "file")
-        File.expects(:unlink).with(backup).raises ArgumentError
+        stub_file = stub(backup, :lstat => stub('stat', :ftype => 'file'))
+        Puppet::FileSystem::File.expects(:new).with(backup).returns stub_file
+        Puppet::FileSystem::File.expects(:unlink).with(backup).raises ArgumentError
         FileUtils.expects(:cp_r).never
-        FileTest.expects(:exists?).with(path).returns(true)
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
 
         lambda { file.perform_backup }.should raise_error(Puppet::Error)
       end
 
       it "should not try to remove backups that don't exist" do
-        File.expects(:lstat).with(backup).raises(Errno::ENOENT)
-        File.expects(:unlink).with(backup).never
+        stub_file = stub(backup)
+        Puppet::FileSystem::File.expects(:new).with(backup).returns stub_file
+        stub_file.expects(:lstat).raises(Errno::ENOENT)
+        Puppet::FileSystem::File.expects(:unlink).with(backup).never
         FileUtils.stubs(:cp_r)
-        FileTest.expects(:exists?).with(path).returns(true)
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
 
         file.perform_backup
       end
 
       it "a copy should be created in the local directory" do
         FileUtils.expects(:cp_r).with(path, backup, :preserve => true)
-        FileTest.stubs(:exists?).with(path).returns(true)
+        Puppet::FileSystem::File.stubs(:exist?).with(path).returns(true)
 
         file.perform_backup.should be_true
       end
@@ -92,7 +98,7 @@ describe Puppet::Util::Backups do
       it "should propagate exceptions if no backup can be created" do
         FileUtils.expects(:cp_r).raises ArgumentError
 
-        FileTest.stubs(:exists?).with(path).returns(true)
+        Puppet::FileSystem::File.stubs(:exist?).with(path).returns(true)
         lambda { file.perform_backup }.should raise_error(Puppet::Error)
       end
     end
@@ -108,10 +114,11 @@ describe Puppet::Util::Backups do
 
       bucket.expects(:backup).with(filename).returns true
 
-      File.stubs(:lstat).with(path).returns(stub('lstat', :ftype => 'directory'))
+      stub_file = stub(path, :lstat => stub('stat', :ftype => 'directory'))
+      Puppet::FileSystem::File.expects(:new).with(path).returns stub_file
 
-      FileTest.stubs(:exists?).with(path).returns(true)
-      FileTest.stubs(:exists?).with(filename).returns(true)
+      Puppet::FileSystem::File.stubs(:exist?).with(path).returns(true)
+      Puppet::FileSystem::File.stubs(:exist?).with(filename).returns(true)
 
       file.perform_backup
     end
@@ -120,7 +127,8 @@ describe Puppet::Util::Backups do
       file = Puppet::Type.type(:file).new(:name => path, :backup => 'foo', :recurse => true)
 
       bucket.expects(:backup).never
-      File.stubs(:stat).with(path).returns(stub('stat', :ftype => 'directory'))
+      stub_file = stub('file', :stat => stub('stat', :ftype => 'directory'))
+      Puppet::FileSystem::File.stubs(:new).with(path).returns stub_file
       Find.expects(:find).never
 
       file.perform_backup

data/spec/unit/util/checksums_spec.rb

@@ -132,7 +132,8 @@ describe Puppet::Util::Checksums do
         file = "/my/file"
         stat = mock 'stat', sum => "mysum"
 
-        File.expects(:stat).with(file).returns(stat)
+        stub_file = stub(file, :stat => stat)
+        Puppet::FileSystem::File.expects(:new).with(file).returns stub_file
 
         @summer.send(sum.to_s + "_file", file).should == "mysum"
       end

data/spec/unit/util/command_line_spec.rb

@@ -143,5 +143,46 @@ describe Puppet::Util::CommandLine do
         Puppet::Util::CommandLine.available_subcommands
       end
     end
+
+    describe 'when setting process priority' do
+      let(:command_line) do
+        Puppet::Util::CommandLine.new("puppet", %w{ agent })
+      end
+
+      before :each do
+        Puppet::Util::CommandLine::ApplicationSubcommand.any_instance.stubs(:run)
+      end
+
+      it 'should never set priority by default' do
+        Process.expects(:setpriority).never
+
+        command_line.execute
+      end
+
+      it 'should lower the process priority if one has been specified' do
+        Puppet[:priority] = 10
+
+        Process.expects(:setpriority).with(0, Process.pid, 10)
+        command_line.execute
+      end
+
+      it 'should warn if trying to raise priority, but not privileged user' do
+        Puppet[:priority] = -10
+
+        Process.expects(:setpriority).raises(Errno::EACCES, 'Permission denied')
+        Puppet.expects(:warning).with("Failed to set process priority to '-10'")
+
+        command_line.execute
+      end
+
+      it "should warn if the platform doesn't support `Process.setpriority`" do
+        Puppet[:priority] = 15
+
+        Process.expects(:setpriority).raises(NotImplementedError, 'NotImplementedError: setpriority() function is unimplemented on this machine')
+        Puppet.expects(:warning).with("Failed to set process priority to '15'")
+
+        command_line.execute
+      end
+    end
   end
 end

data/spec/unit/util/docs_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Puppet::Util::Docs do
+
+  describe '.scrub' do
+    let(:my_cleaned_output) do
+      %q{This resource type uses the prescribed native tools for creating
+groups and generally uses POSIX APIs for retrieving information
+about them.  It does not directly modify `/etc/passwd` or anything.
+
+* Just for fun, we'll add a list.
+* list item two,
+  which has some add'l lines included in it.
+
+And here's a code block:
+
+    this is the piece of code
+    it does something cool
+
+**Autorequires:** I would be listing autorequired resources here.}
+    end
+
+    it "strips the least common indent from multi-line strings, without mangling indentation beyond the least common indent" do
+      input = <<EOT
+        This resource type uses the prescribed native tools for creating
+        groups and generally uses POSIX APIs for retrieving information
+        about them.  It does not directly modify `/etc/passwd` or anything.
+
+        * Just for fun, we'll add a list.
+        * list item two,
+          which has some add'l lines included in it.
+
+        And here's a code block:
+
+            this is the piece of code
+            it does something cool
+
+        **Autorequires:** I would be listing autorequired resources here.
+EOT
+      output = Puppet::Util::Docs.scrub(input)
+      expect(output).to eq my_cleaned_output
+    end
+
+    it "ignores the first line when calculating least common indent" do
+      input = "This resource type uses the prescribed native tools for creating
+        groups and generally uses POSIX APIs for retrieving information
+        about them.  It does not directly modify `/etc/passwd` or anything.
+
+        * Just for fun, we'll add a list.
+        * list item two,
+          which has some add'l lines included in it.
+
+        And here's a code block:
+
+            this is the piece of code
+            it does something cool
+
+        **Autorequires:** I would be listing autorequired resources here."
+      output = Puppet::Util::Docs.scrub(input)
+      expect(output).to eq my_cleaned_output
+    end
+
+    it "strips trailing whitespace from each line, and strips trailing newlines at end" do
+      input = "This resource type uses the prescribed native tools for creating  \n        groups and generally uses POSIX APIs for retrieving information \n        about them.  It does not directly modify `/etc/passwd` or anything.  \n\n        * Just for fun, we'll add a list. \n        * list item two,\n          which has some add'l lines included in it.    \n\n        And here's a code block:\n\n            this is the piece of code \n            it does something cool \n\n        **Autorequires:** I would be listing autorequired resources here. \n\n"
+      output = Puppet::Util::Docs.scrub(input)
+      expect(output).to eq my_cleaned_output
+    end
+
+    it "has no side effects on original input string" do
+      input       = "First line \n        second line \n        \n            indented line \n        \n        last line\n\n"
+      clean_input = "First line \n        second line \n        \n            indented line \n        \n        last line\n\n"
+      not_used = Puppet::Util::Docs.scrub(input)
+      expect(input).to eq clean_input
+    end
+
+    it "does not include whitespace-only lines when calculating least common indent" do
+      input           = "First line\n        second line\n  \n            indented line\n\n        last line"
+      expected_output = "First line\nsecond line\n\n    indented line\n\nlast line"
+      #bogus_output   = "First line\nsecond line\n\n  indented line\n\nlast line"
+      output = Puppet::Util::Docs.scrub(input)
+      expect(output).to eq expected_output
+    end
+
+    it "accepts a least common indent of zero, thus not adding errors when input string is already scrubbed" do
+      expect(Puppet::Util::Docs.scrub(my_cleaned_output)).to eq my_cleaned_output
+    end
+
+
+  end
+end
+

data/spec/unit/util/execution_spec.rb

@@ -311,6 +311,16 @@ describe Puppet::Util::Execution do
 
           expect { Puppet::Util::Execution.execute('test command') }.to raise_error(RuntimeError)
         end
+
+        it "should return the correct exit status even when exit status is greater than 256" do
+          real_exit_status = 3010
+
+          Puppet::Util::Execution.stubs(:execute_windows).returns(proc_info_stub)
+          stub_process_wait(real_exit_status)
+          $CHILD_STATUS.stubs(:exitstatus).returns(real_exit_status % 256) # The exitstatus is changed to be mod 256 so that ruby can fit it into 8 bits.
+
+          Puppet::Util::Execution.execute('test command', :failonfail => false).exitstatus.should == real_exit_status
+        end
       end
     end
 
@@ -509,7 +519,7 @@ describe Puppet::Util::Execution do
         Tempfile.stubs(:new).returns(stdout)
         stdout.write("My expected command output")
 
-        Puppet::Util::Execution.execute('test command', :squelch => true).should == nil
+        Puppet::Util::Execution.execute('test command', :squelch => true).should == ''
       end
 
       it "should delete the file used for output if squelch is false" do
@@ -519,7 +529,7 @@ describe Puppet::Util::Execution do
 
         Puppet::Util::Execution.execute('test command')
 
-        File.should_not be_exist(path)
+        Puppet::FileSystem::File.exist?(path).should be_false
       end
 
       it "should not raise an error if the file is open" do
@@ -591,6 +601,20 @@ describe Puppet::Util::Execution do
       Puppet::Util::Execution.execpipe('echo hello').should == 'hello'
     end
 
+    it "should print meaningful debug message for string argument" do
+      Puppet::Util::Execution.expects(:debug).with("Executing 'echo hello'")
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
+      $CHILD_STATUS.expects(:==).with(0).returns(true)
+      Puppet::Util::Execution.execpipe('echo hello')
+    end
+
+    it "should print meaningful debug message for array argument" do
+      Puppet::Util::Execution.expects(:debug).with("Executing 'echo hello'")
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
+      $CHILD_STATUS.expects(:==).with(0).returns(true)
+      Puppet::Util::Execution.execpipe(['echo','hello'])
+    end
+
     it "should execute an array by pasting together with spaces" do
       Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
       $CHILD_STATUS.expects(:==).with(0).returns(true)

data/spec/unit/util/filetype_spec.rb

@@ -16,15 +16,15 @@ describe Puppet::Util::FileType do
 
     describe "when the file already exists" do
       it "should return the file's contents when asked to read it" do
-        File.expects(:exist?).with(path).returns true
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns true
         File.expects(:read).with(path).returns "my text"
 
         file.read.should == "my text"
       end
 
       it "should unlink the file when asked to remove it" do
-        File.expects(:exist?).with(path).returns true
-        File.expects(:unlink).with(path)
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns true
+        Puppet::FileSystem::File.expects(:unlink).with(path)
 
         file.remove
       end
@@ -32,7 +32,7 @@ describe Puppet::Util::FileType do
 
     describe "when the file does not exist" do
       it "should return an empty string when asked to read the file" do
-        File.expects(:exist?).with(path).returns false
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns false
 
         file.read.should == ""
       end
@@ -63,13 +63,13 @@ describe Puppet::Util::FileType do
 
     describe "when backing up a file" do
       it "should do nothing if the file does not exist" do
-        File.expects(:exists?).with(path).returns false
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns false
         file.expects(:bucket).never
         file.backup
       end
 
       it "should use its filebucket to backup the file if it exists" do
-        File.expects(:exists?).with(path).returns true
+        Puppet::FileSystem::File.expects(:exist?).with(path).returns true
 
         bucket = mock 'bucket'
         bucket.expects(:backup).with(path)
@@ -155,7 +155,7 @@ describe Puppet::Util::FileType do
       end
 
       after :each do
-        File.should_not be_exist @tmp_cron_path
+        Puppet::FileSystem::File.exist?(@tmp_cron_path).should be_false
       end
 
       it "should run crontab as the target user on a temporary file" do