puppet 3.3.2 → 3.4.0.rc1

data/spec/unit/transaction_spec.rb

@@ -308,7 +308,7 @@ describe Puppet::Transaction do
       transaction.evaluate
 
       generated.each do |res|
-        res.must be_tagged(generator.tags)
+        res.must be_tagged(*generator.tags)
       end
     end
   end
@@ -404,7 +404,6 @@ describe Puppet::Transaction do
     it "should otherwise let the resource determine if it is missing tags" do
       tags = ['one', 'two']
       @transaction.tags = tags
-      @resource.expects(:tagged?).with(*tags).returns(false)
       @transaction.should be_missing_tags(@resource)
     end
   end
@@ -478,6 +477,48 @@ describe Puppet::Transaction do
     end
   end
 
+  describe "during teardown" do
+    before :each do
+      @catalog = Puppet::Resource::Catalog.new
+      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::RandomPrioritizer.new)
+    end
+
+    it "should call ::post_resource_eval on provider classes that support it" do
+      @resource = Puppet::Type.type(:notify).new :title => "foo"
+      @catalog.add_resource @resource
+
+      # 'expects' will cause 'respond_to?(:post_resource_eval)' to return true
+      @resource.provider.class.expects(:post_resource_eval)
+      @transaction.evaluate
+    end
+
+    it "should call ::post_resource_eval even if other providers' ::post_resource_eval fails" do
+      @resource3 = Puppet::Type.type(:user).new :title => "bloo"
+      @resource3.provider.class.stubs(:post_resource_eval).raises
+      @resource4 = Puppet::Type.type(:notify).new :title => "blob"
+      @resource4.provider.class.stubs(:post_resource_eval).raises
+      @catalog.add_resource @resource3
+      @catalog.add_resource @resource4
+
+      # ruby's Set does not guarantee ordering, so both resource3 and resource4
+      # need to expect post_resource_eval, rather than just the 'first' one.
+      @resource3.provider.class.expects(:post_resource_eval)
+      @resource4.provider.class.expects(:post_resource_eval)
+
+      @transaction.evaluate
+    end
+
+    it "should call ::post_resource_eval even if one of the resources fails" do
+      @resource3 = Puppet::Type.type(:notify).new :title => "bloo"
+      @resource3.stubs(:retrieve_resource).raises
+      @catalog.add_resource @resource3
+
+      @resource3.provider.class.expects(:post_resource_eval)
+
+      @transaction.evaluate
+    end
+  end
+
   describe 'when checking application run state' do
     before do
       @catalog = Puppet::Resource::Catalog.new
@@ -594,32 +635,37 @@ describe Puppet::Transaction, " when determining tags" do
 
   it "should default to the tags specified in the :tags setting" do
     Puppet[:tags] = "one"
-    @transaction.tags.should == %w{one}
+    @transaction.should be_tagged("one")
   end
 
   it "should split tags based on ','" do
     Puppet[:tags] = "one,two"
-    @transaction.tags.should == %w{one two}
+    @transaction.should be_tagged("one")
+    @transaction.should be_tagged("two")
   end
 
   it "should use any tags set after creation" do
     Puppet[:tags] = ""
     @transaction.tags = %w{one two}
-    @transaction.tags.should == %w{one two}
+    @transaction.should be_tagged("one")
+    @transaction.should be_tagged("two")
   end
 
   it "should always convert assigned tags to an array" do
     @transaction.tags = "one::two"
-    @transaction.tags.should == %w{one::two}
+    @transaction.should be_tagged("one::two")
   end
 
   it "should accept a comma-delimited string" do
     @transaction.tags = "one, two"
-    @transaction.tags.should == %w{one two}
+    @transaction.should be_tagged("one")
+    @transaction.should be_tagged("two")
   end
 
   it "should accept an empty string" do
+    @transaction.tags = "one, two"
+    @transaction.should be_tagged("one")
     @transaction.tags = ""
-    @transaction.tags.should == []
+    @transaction.should_not be_tagged("one")
   end
 end

data/spec/unit/type/component_spec.rb

@@ -42,8 +42,8 @@ describe component do
       component.new(:name => "Class[foo]").pathbuilder.must == ["Foo"]
     end
 
-    it "should produce an empty string if the component models the 'main' class" do
-      component.new(:name => "Class[main]").pathbuilder.must == [""]
+    it "should produce the class name even for the class named main" do
+      component.new(:name => "Class[main]").pathbuilder.must == ["Main"]
     end
 
     it "should produce a resource reference if the component does not model a class" do

data/spec/unit/type/exec_spec.rb

@@ -8,6 +8,8 @@ describe Puppet::Type.type(:exec) do
     Puppet.features.stubs(:root?).returns(true)
 
     output = rest.delete(:output) || ''
+
+    output = Puppet::Util::Execution::ProcessOutput.new(output, exitstatus)
     tries  = rest[:tries] || 1
 
     args = {
@@ -21,14 +23,12 @@ describe Puppet::Type.type(:exec) do
     exec = Puppet::Type.type(:exec).new(args)
 
     status = stub "process", :exitstatus => exitstatus
-    Puppet::Util::SUIDManager.expects(:run_and_capture).times(tries).
+    Puppet::Util::Execution.expects(:execute).times(tries).
       with() { |*args|
         args[0] == command &&
-        args[1] == nil &&
-        args[2] == nil &&
-        args[3][:override_locale] == false &&
-        args[3].has_key?(:custom_environment)
-      } .returns([output, status])
+        args[1][:override_locale] == false &&
+        args[1].has_key?(:custom_environment)
+      }.returns(output)
 
     return exec
   end
@@ -61,7 +61,7 @@ describe Puppet::Type.type(:exec) do
     end
 
     describe "when execing" do
-      it "should use the 'run_and_capture' method to exec" do
+      it "should use the 'execute' method to exec" do
         exec_tester("true").refresh.should == :executed_command
       end
 
@@ -753,4 +753,11 @@ describe Puppet::Type.type(:exec) do
       type.new(:command => abs, :path => path).must be
     end
   end
+  describe "when providing a umask" do
+    it "should fail if an invalid umask is used" do
+      resource = Puppet::Type.type(:exec).new :command => @command
+      expect { resource[:umask] = '0028'}.to raise_error(Puppet::ResourceError, /umask specification is invalid/)
+      expect { resource[:umask] = '28' }.to raise_error(Puppet::ResourceError, /umask specification is invalid/)
+    end
+  end
 end

data/spec/unit/type/file/content_spec.rb

@@ -84,6 +84,13 @@ describe content do
 
       @content.should.must == string
     end
+
+    it "should convert the value to ASCII-8BIT", :if => "".respond_to?(:encode) do
+      @content = content.new(:resource => @resource)
+      @content.should= "Let's make a \u{2603}"
+
+      @content.actual_content.should == "Let's make a \xE2\x98\x83".force_encoding(Encoding::ASCII_8BIT)
+    end
   end
 
   describe "when retrieving the current content" do
@@ -329,8 +336,10 @@ describe content do
       end
 
       it "should copy content from the source to the file" do
+        dest_file = Puppet::FileSystem::File.new(@filename)
         @resource.write(@source)
-        IO.binread(@filename).should == @source_content
+
+        dest_file.binread.should == @source_content
       end
 
       it "should return the checksum computed" do
@@ -358,8 +367,10 @@ describe content do
       end
 
       it "should write the contents to the file" do
+        dest_file = Puppet::FileSystem::File.new(@filename)
         @resource.write(@source)
-        IO.binread(@filename).should == @source_content
+
+        dest_file.binread.should == @source_content
       end
 
       it "should not write anything if source is not found" do

data/spec/unit/type/file/ctime_spec.rb

@@ -16,7 +16,7 @@ describe Puppet::Type.type(:file).attrclass(:ctime) do
     @resource[:audit] = [:ctime]
 
     # this .to_resource audit behavior is magical :-(
-    @resource.to_resource[:ctime].should == File.stat(@filename).ctime
+    @resource.to_resource[:ctime].should == Puppet::FileSystem::File.new(@filename).stat.ctime
   end
 
   it "should return absent if auditing an absent file" do

data/spec/unit/type/file/mode_spec.rb

@@ -18,6 +18,10 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
       expect { mode.value = '0755' }.not_to raise_error
     end
 
+    it "should accept valid symbolic strings" do
+      expect { mode.value = 'g+w,u-x' }.not_to raise_error
+    end
+
     it "should not accept strings other than octal numbers" do
       expect do
         mode.value = 'readable please!'
@@ -35,6 +39,10 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
       mode.munge('0644').should == '644'
     end
 
+    it "should accept symbolic strings as arguments and return them intact" do
+      mode.munge('u=rw,go=r').should == 'u=rw,go=r'
+    end
+
     it "should accept integers are arguments" do
       mode.munge(0644).should == '644'
     end
@@ -72,11 +80,34 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
       mode.must_not be_insync('755')
     end
 
-    it "should return true if the file is a link and we are managing links", :unless => Puppet.features.microsoft_windows? do
-      File.symlink('anything', path)
+    it "should return true if the file is a link and we are managing links", :if => Puppet.features.manages_symlinks? do
+      Puppet::FileSystem::File.new('anything').symlink(path)
 
       mode.must be_insync('644')
     end
+
+    describe "with a symbolic mode" do
+      let(:resource_sym) { Puppet::Type.type(:file).new :path => path, :mode => 'u+w,g-w' }
+      let(:mode_sym) { resource_sym.property(:mode) }
+
+      it "should return true if the mode matches, regardless of other bits" do
+        FileUtils.touch(path)
+
+        mode_sym.must be_insync('644')
+      end
+
+      it "should return false if the mode requires 0's where there are 1's" do
+        FileUtils.touch(path)
+
+        mode_sym.must_not be_insync('624')
+      end
+
+      it "should return false if the mode requires 1's where there are 0's" do
+        FileUtils.touch(path)
+
+        mode_sym.must_not be_insync('044')
+      end
+    end
   end
 
   describe "#retrieve" do
@@ -145,4 +176,19 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
       end
     end
   end
+
+  describe "#sync with a symbolic mode" do
+    let(:resource_sym) { Puppet::Type.type(:file).new :path => path, :mode => 'u+w,g-w' }
+    let(:mode_sym) { resource_sym.property(:mode) }
+
+    before { FileUtils.touch(path) }
+
+    it "changes only the requested bits" do
+      # lower nibble must be set to 4 for the sake of passing on Windows
+      FileUtils.chmod 0464, path
+      mode_sym.sync
+      file = Puppet::FileSystem::File.new(path)
+      (file.stat.mode & 0777).to_s(8).should == "644"
+    end
+  end
 end

data/spec/unit/type/file/mtime_spec.rb

@@ -16,7 +16,7 @@ describe Puppet::Type.type(:file).attrclass(:mtime) do
     @resource[:audit] = [:mtime]
 
     # this .to_resource audit behavior is magical :-(
-    @resource.to_resource[:mtime].should == File.stat(@filename).mtime
+    @resource.to_resource[:mtime].should == Puppet::FileSystem::File.new(@filename).stat.mtime
   end
 
   it "should return absent if auditing an absent file" do

data/spec/unit/type/file/source_spec.rb

@@ -154,11 +154,10 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
   describe "when copying the source values" do
     before do
-
       @resource = Puppet::Type.type(:file).new :path => @foobar
 
       @source = source.new(:resource => @resource)
-      @metadata = stub 'metadata', :owner => 100, :group => 200, :mode => 123, :checksum => "{md5}asdfasdf", :ftype => "file", :source => @foobar
+      @metadata = stub 'metadata', :owner => 100, :group => 200, :mode => "173", :checksum => "{md5}asdfasdf", :ftype => "file", :source => @foobar
       @source.stubs(:metadata).returns @metadata
 
       Puppet.features.stubs(:root?).returns true
@@ -202,7 +201,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
         @resource[:content].must == @metadata.checksum
       end
 
-      it "should not copy the metadata's owner to the resource if it is already set" do
+      it "should not copy the metadata's owner, group, checksum and mode to the resource if they are already set" do
         @resource[:owner] = 1
         @resource[:group] = 2
         @resource[:mode] = 3
@@ -217,26 +216,153 @@ describe Puppet::Type.type(:file).attrclass(:source) do
       end
 
       describe "and puppet is not running as root" do
-        it "should not try to set the owner" do
-          Puppet.features.expects(:root?).returns false
+        before do
+          Puppet.features.stubs(:root?).returns false
+        end
 
+        it "should not try to set the owner" do
           @source.copy_source_values
           @resource[:owner].should be_nil
         end
+
+        it "should not try to set the group" do
+          @source.copy_source_values
+          @resource[:group].should be_nil
+        end
+      end
+
+      context "when source_permissions is `use_when_creating`" do
+        before :each do
+          @resource[:source_permissions] = "use_when_creating"
+          Puppet.features.expects(:root?).returns true
+          @source.stubs(:local?).returns(false)
+        end
+
+        context "when managing a new file" do
+          it "should copy owner and group from local sources" do
+            @source.stubs(:local?).returns true
+
+            @source.copy_source_values
+
+            @resource[:owner].must == 100
+            @resource[:group].must == 200
+            @resource[:mode].must == "173"
+          end
+
+          it "copies the remote owner" do
+            @source.copy_source_values
+
+            @resource[:owner].must == 100
+          end
+
+          it "copies the remote group" do
+            @source.copy_source_values
+
+            @resource[:group].must == 200
+          end
+
+          it "copies the remote mode" do
+            @source.copy_source_values
+
+            @resource[:mode].must == "173"
+          end
+        end
+
+        context "when managing an existing file" do
+          before :each do
+            Puppet::FileSystem::File.stubs(:exist?).with(@resource[:path]).returns(true)
+          end
+
+          it "should not copy owner, group or mode from local sources" do
+            @source.stubs(:local?).returns true
+
+            @source.copy_source_values
+
+            @resource[:owner].must be_nil
+            @resource[:group].must be_nil
+            @resource[:mode].must be_nil
+          end
+
+          it "preserves the local owner" do
+            @source.copy_source_values
+
+            @resource[:owner].must be_nil
+          end
+
+          it "preserves the local group" do
+            @source.copy_source_values
+
+            @resource[:group].must be_nil
+          end
+
+          it "preserves the local mode" do
+            @source.copy_source_values
+
+            @resource[:mode].must be_nil
+          end
+        end
+      end
+
+      context "when source_permissions is `ignore`" do
+        before :each do
+          @resource[:source_permissions] = "ignore"
+          @source.stubs(:local?).returns(false)
+          Puppet.features.expects(:root?).returns true
+        end
+
+        it "should not copy owner, group or mode from local sources" do
+          @source.stubs(:local?).returns true
+
+          @source.copy_source_values
+
+          @resource[:owner].must be_nil
+          @resource[:group].must be_nil
+          @resource[:mode].must be_nil
+        end
+
+        it "preserves the local owner" do
+          @source.copy_source_values
+
+          @resource[:owner].must be_nil
+        end
+
+        it "preserves the local group" do
+          @source.copy_source_values
+
+          @resource[:group].must be_nil
+        end
+
+        it "preserves the local mode" do
+          @source.copy_source_values
+
+          @resource[:mode].must be_nil
+        end
       end
 
       describe "on Windows" do
         before :each do
           Puppet.features.stubs(:microsoft_windows?).returns true
         end
+        let(:deprecation_message) { "Copying owner/mode/group from the" <<
+              " source file on Windows is deprecated;" <<
+              " use source_permissions => ignore." }
 
-        it "should not copy owner and group from remote sources" do
+        it "should copy only mode from remote sources" do
           @source.stubs(:local?).returns false
 
           @source.copy_source_values
 
           @resource[:owner].must be_nil
           @resource[:group].must be_nil
+          @resource[:mode].must == "173"
+        end
+
+        it "should copy mode from remote sources" do
+          @source.stubs(:local?).returns false
+
+          @source.copy_source_values
+
+          @resource[:mode].must == "173"
         end
 
         it "should copy owner and group from local sources" do
@@ -246,6 +372,51 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
           @resource[:owner].must == 100
           @resource[:group].must == 200
+          @resource[:mode].must == "173"
+        end
+
+        it "should issue deprecation warning when copying metadata from remote sources when group, owner, and mode are unspecified" do
+          @source.stubs(:local?).returns false
+          Puppet.expects(:deprecation_warning).with(deprecation_message).at_least_once
+
+          @source.copy_source_values
+        end
+
+        it "should issue deprecation warning when copying metadata from remote sources if only user is unspecified" do
+          @source.stubs(:local?).returns false
+          Puppet.expects(:deprecation_warning).with(deprecation_message).at_least_once
+          @resource[:group] = 2
+          @resource[:mode] = 3
+
+          @source.copy_source_values
+        end
+
+        it "should issue deprecation warning when copying metadata from remote sources if only group is unspecified" do
+          @source.stubs(:local?).returns false
+          Puppet.expects(:deprecation_warning).with(deprecation_message).at_least_once
+          @resource[:owner] = 1
+          @resource[:mode] = 3
+
+          @source.copy_source_values
+        end
+
+        it "should issue deprecation warning when copying metadata from remote sources if only mode is unspecified" do
+          @source.stubs(:local?).returns false
+          Puppet.expects(:deprecation_warning).with(deprecation_message).at_least_once
+          @resource[:owner] = 1
+          @resource[:group] = 2
+
+          @source.copy_source_values
+        end
+
+        it "should not issue deprecation warning when copying metadata from remote sources if group, owner, and mode are all specified" do
+          @source.stubs(:local?).returns false
+          Puppet.expects(:deprecation_warning).with(deprecation_message).never
+          @resource[:owner] = 1
+          @resource[:group] = 2
+          @resource[:mode] = 3
+
+          @source.copy_source_values
         end
       end
     end
@@ -358,5 +529,4 @@ describe Puppet::Type.type(:file).attrclass(:source) do
       end
     end
   end
-
 end