puppet 2.7.6 → 2.7.8

data/spec/unit/type/exec_spec.rb

@@ -186,18 +186,38 @@ describe Puppet::Type.type(:exec) do
     end
   end
 
-  describe "when setting user", :fails_on_windows => true do
-    it "should fail if we are not root" do
-      Puppet.features.stubs(:root?).returns(false)
-      expect { Puppet::Type.type(:exec).new(:name => @command, :user => 'input') }.
-        should raise_error Puppet::Error, /Parameter user failed/
+  describe "when setting user" do
+    describe "on POSIX systems" do
+      before :each do
+        Puppet.features.stubs(:posix?).returns(true)
+        Puppet.features.stubs(:microsoft_windows?).returns(false)
+      end
+
+      it "should fail if we are not root" do
+        Puppet.features.stubs(:root?).returns(false)
+        expect { Puppet::Type.type(:exec).new(:name => '/bin/true whatever', :user => 'input') }.
+          should raise_error Puppet::Error, /Parameter user failed/
+      end
+
+      ['one', 2, 'root', 4294967295, 4294967296].each do |value|
+        it "should accept '#{value}' as user if we are root" do
+          Puppet.features.stubs(:root?).returns(true)
+          type = Puppet::Type.type(:exec).new(:name => '/bin/true whatever', :user => value)
+          type[:user].should == value
+        end
+      end
     end
 
-    ['one', 2, 'root', 4294967295, 4294967296].each do |value|
-      it "should accept '#{value}' as user if we are root" do
+    describe "on Windows systems" do
+      before :each do
+        Puppet.features.stubs(:posix?).returns(false)
+        Puppet.features.stubs(:microsoft_windows?).returns(true)
         Puppet.features.stubs(:root?).returns(true)
-        type = Puppet::Type.type(:exec).new(:name => @command, :user => value)
-        type[:user].should == value
+      end
+
+      it "should reject user parameter" do
+        expect { Puppet::Type.type(:exec).new(:name => 'c:\windows\notepad.exe', :user => 'input') }.
+          should raise_error Puppet::Error, /Unable to execute commands as other users on Windows/
       end
     end
   end
@@ -205,7 +225,7 @@ describe Puppet::Type.type(:exec) do
   describe "when setting group" do
     shared_examples_for "exec[:group]" do
       ['one', 2, 'wheel', 4294967295, 4294967296].each do |value|
-        it "should accept '#{value}' without error or judgement", :fails_on_windows => true do
+        it "should accept '#{value}' without error or judgement" do
           type = Puppet::Type.type(:exec).new(:name => @command, :group => value)
           type[:group].should == value
         end
@@ -352,16 +372,16 @@ describe Puppet::Type.type(:exec) do
         end
       end
 
-      it "should fail if timeout is exceeded", :fails_on_windows => true do
+      it "should fail if timeout is exceeded" do
         Puppet::Util.stubs(:execute).with do |cmd,args|
           sleep 1
           true
         end
         FileTest.stubs(:file?).returns(false)
-        FileTest.stubs(:file?).with('/bin/sleep').returns(true)
+        FileTest.stubs(:file?).with(File.expand_path('/bin/sleep')).returns(true)
         FileTest.stubs(:executable?).returns(false)
-        FileTest.stubs(:executable?).with('/bin/sleep').returns(true)
-        sleep_exec = Puppet::Type.type(:exec).new(:name => 'sleep 1', :path => ['/bin'], :timeout => '0.2')
+        FileTest.stubs(:executable?).with(File.expand_path('/bin/sleep')).returns(true)
+        sleep_exec = Puppet::Type.type(:exec).new(:name => 'sleep 1', :path => [File.expand_path('/bin')], :timeout => '0.2')
 
         lambda { sleep_exec.refresh }.should raise_error Puppet::Error, "Command exceeded timeout"
       end
@@ -616,7 +636,7 @@ describe Puppet::Type.type(:exec) do
     end
   end
 
-  describe "#retrieve", :fails_on_windows => true do
+  describe "#retrieve" do
     before :each do
       @exec_resource = Puppet::Type.type(:exec).new(:name => @bogus_cmd)
     end

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

@@ -1,5 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
+require 'puppet/network/http_pool'
 
 content = Puppet::Type.type(:file).attrclass(:content)
 describe content do
@@ -178,7 +179,7 @@ describe content do
         it "should display a diff if the current contents are different from the desired content" do
           @content.should = "some content"
           @content.expects(:diff).returns("my diff").once
-          @content.expects(:print).with("my diff").once
+          @content.expects(:notice).with("\nmy diff").once
 
           @content.safe_insync?("other content")
         end
@@ -250,7 +251,7 @@ describe content do
     end
 
     it "should attempt to read from the filebucket if no actual content nor source exists" do
-      @fh = File.open(@filename, 'w')
+      @fh = File.open(@filename, 'wb')
       @content.should = "{md5}foo"
       @content.resource.bucket.class.any_instance.stubs(:getfile).returns "foo"
       @content.write(@fh)
@@ -299,13 +300,13 @@ describe content do
       end
     end
 
-    describe "from local source", :fails_on_windows => true do
+    describe "from local source" do
       before(:each) do
         @sourcename = tmpfile('source')
         @resource = Puppet::Type.type(:file).new :path => @filename, :backup => false, :source => @sourcename
 
-        @source_content = "source file content"*10000
-        @sourcefile = File.open(@sourcename, 'w') {|f| f.write @source_content}
+        @source_content = "source file content\r\n"*10000
+        @sourcefile = File.open(@sourcename, 'wb') {|f| f.write @source_content}
 
         @content = @resource.newattr(:content)
         @source = @resource.parameter :source #newattr(:source)
@@ -313,11 +314,11 @@ describe content do
 
       it "should copy content from the source to the file" do
         @resource.write(@source)
-        File.read(@filename).should == @source_content
+        Puppet::Util.binread(@filename).should == @source_content
       end
 
       it "should return the checksum computed" do
-        File.open(@filename, 'w') do |file|
+        File.open(@filename, 'wb') do |file|
           @content.write(file).should == "{md5}#{Digest::MD5.hexdigest(@source_content)}"
         end
       end
@@ -327,8 +328,8 @@ describe content do
       before(:each) do
         @resource = Puppet::Type.type(:file).new :path => @filename, :backup => false
         @response = stub_everything 'response', :code => "200"
-        @source_content = "source file content"*10000
-        @response.stubs(:read_body).multiple_yields(*(["source file content"]*10000))
+        @source_content = "source file content\n"*10000
+        @response.stubs(:read_body).multiple_yields(*(["source file content\n"]*10000))
 
         @conn = stub_everything 'connection'
         @conn.stubs(:request_get).yields(@response)
@@ -342,7 +343,7 @@ describe content do
 
       it "should write the contents to the file" do
         @resource.write(@source)
-        File.read(@filename).should == @source_content
+        Puppet::Util.binread(@filename).should == @source_content
       end
 
       it "should not write anything if source is not found" do

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

@@ -26,43 +26,36 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
   end
 
   describe "#munge" do
-    it "should dirmask the value when munging" do
-      Dir.mkdir(path)
-      mode.value = 0644
-
-      mode.value.must == '755'
-    end
-  end
-
-  describe "#dirmask" do
-    before :each do
-      Dir.mkdir(path)
-    end
-
     # This is sort of a redundant test, but its spec is important.
     it "should return the value as a string" do
-      mode.dirmask('0644').should be_a(String)
+      mode.munge('0644').should be_a(String)
     end
 
     it "should accept strings as arguments" do
-      mode.dirmask('0644').should == '755'
+      mode.munge('0644').should == '644'
     end
 
     it "should accept integers are arguments" do
-      mode.dirmask(0644).should == '755'
+      mode.munge(0644).should == '644'
+    end
+  end
+
+  describe "#dirmask" do
+    before :each do
+      Dir.mkdir(path)
     end
 
     it "should add execute bits corresponding to read bits for directories" do
-      mode.dirmask(0644).should == '755'
+      mode.dirmask('0644').should == '755'
     end
 
     it "should not add an execute bit when there is no read bit" do
-      mode.dirmask(0600).should == '700'
+      mode.dirmask('0600').should == '700'
     end
 
     it "should not add execute bits for files that aren't directories" do
       resource[:path] = tmpfile('other_file')
-      mode.dirmask(0644).should == '644'
+      mode.dirmask('0644').should == '0644'
     end
   end
 
@@ -85,4 +78,65 @@ describe Puppet::Type.type(:file).attrclass(:mode) do
       mode.must be_insync('644')
     end
   end
+
+  describe "#retrieve" do
+    it "should return absent if the resource doesn't exist" do
+      resource[:path] = File.expand_path("/does/not/exist")
+      mode.retrieve.should == :absent
+    end
+
+    it "should retrieve the directory mode from the provider" do
+      Dir.mkdir(path)
+
+      mode.expects(:dirmask).with('644').returns '755'
+      resource.provider.expects(:mode).returns '755'
+
+      mode.retrieve.should == '755'
+    end
+
+    it "should retrieve the file mode from the provider" do
+      FileUtils.touch(path)
+
+      mode.expects(:dirmask).with('644').returns '644'
+      resource.provider.expects(:mode).returns '644'
+
+      mode.retrieve.should == '644'
+    end
+  end
+
+  describe '#should_to_s' do
+    describe 'with a 3-digit mode' do
+      it 'returns a 4-digit mode with a leading zero' do
+        mode.should_to_s('755').should == '0755'
+      end
+    end
+
+    describe 'with a 4-digit mode' do
+      it 'returns the 4-digit mode when the first digit is a zero' do
+        mode.should_to_s('0755').should == '0755'
+      end
+
+      it 'returns the 4-digit mode when the first digit is not a zero' do
+        mode.should_to_s('1755').should == '1755'
+      end
+    end
+  end
+
+  describe '#is_to_s' do
+    describe 'with a 3-digit mode' do
+      it 'returns a 4-digit mode with a leading zero' do
+        mode.is_to_s('755').should == '0755'
+      end
+    end
+
+    describe 'with a 4-digit mode' do
+      it 'returns the 4-digit mode when the first digit is a zero' do
+        mode.is_to_s('0755').should == '0755'
+      end
+
+      it 'returns the 4-digit mode when the first digit is not a zero' do
+        mode.is_to_s('1755').should == '1755'
+      end
+    end
+  end
 end

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

@@ -89,7 +89,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
     end
   end
 
-  describe "when returning the metadata", :fails_on_windows => true do
+  describe "when returning the metadata" do
     before do
       @metadata = stub 'metadata', :source= => nil
     end

data/spec/unit/type/file_spec.rb

@@ -385,6 +385,21 @@ describe Puppet::Type.type(:file) do
     end
   end
 
+  describe "#ancestors" do
+    it "should return the ancestors of the file, in ascending order" do
+      file = described_class.new(:path => make_absolute("/tmp/foo/bar/baz/qux"))
+
+      pieces = %W[#{make_absolute('/')} tmp foo bar baz]
+
+      ancestors = file.ancestors
+
+      ancestors.should_not be_empty
+      ancestors.reverse.each_with_index do |path,i|
+        path.should == File.join(*pieces[0..i])
+      end
+    end
+  end
+
   describe "#flush" do
     it "should flush all properties that respond to :flush" do
       file[:source] = File.expand_path(__FILE__)

data/spec/unit/type/group_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-describe Puppet::Type.type(:group), :fails_on_windows => true do
+describe Puppet::Type.type(:group) do
   before do
     ENV["PATH"] += File::PATH_SEPARATOR + "/usr/sbin" unless ENV["PATH"].split(File::PATH_SEPARATOR).include?("/usr/sbin")
     @class = Puppet::Type.type(:group)

data/spec/unit/type/mount_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-describe Puppet::Type.type(:mount), :fails_on_windows => true do
+describe Puppet::Type.type(:mount), :unless => Puppet.features.microsoft_windows? do
   it "should have a :refreshable feature that requires the :remount method" do
     Puppet::Type.type(:mount).provider_feature(:refreshable).methods.should == [:remount]
   end
@@ -16,7 +16,7 @@ describe Puppet::Type.type(:mount), :fails_on_windows => true do
   end
 end
 
-describe Puppet::Type.type(:mount), "when validating attributes", :fails_on_windows => true do
+describe Puppet::Type.type(:mount), "when validating attributes" do
   [:name, :remounts, :provider].each do |param|
     it "should have a #{param} parameter" do
       Puppet::Type.type(:mount).attrtype(param).should == :param
@@ -30,7 +30,7 @@ describe Puppet::Type.type(:mount), "when validating attributes", :fails_on_wind
   end
 end
 
-describe Puppet::Type.type(:mount)::Ensure, "when validating values", :fails_on_windows => true do
+describe Puppet::Type.type(:mount)::Ensure, "when validating values", :unless => Puppet.features.microsoft_windows? do
   before do
     @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil
     Puppet::Type.type(:mount).defaultprovider.expects(:new).returns(@provider)
@@ -62,7 +62,7 @@ describe Puppet::Type.type(:mount)::Ensure, "when validating values", :fails_on_
   end
 end
 
-describe Puppet::Type.type(:mount)::Ensure, :fails_on_windows => true do
+describe Puppet::Type.type(:mount)::Ensure, :unless => Puppet.features.microsoft_windows? do
   before :each do
     provider_properties = {}
     @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock, :property_hash => provider_properties
@@ -279,7 +279,7 @@ describe Puppet::Type.type(:mount)::Ensure, :fails_on_windows => true do
   end
 end
 
-describe Puppet::Type.type(:mount), "when modifying an existing mount entry", :fails_on_windows => true do
+describe Puppet::Type.type(:mount), "when modifying an existing mount entry", :unless => Puppet.features.microsoft_windows? do
   before do
     @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock, :remount => nil
     Puppet::Type.type(:mount).defaultprovider.stubs(:new).returns(@provider)

data/spec/unit/type/resources_spec.rb

@@ -51,7 +51,7 @@ describe resources do
           @resources.generate.collect { |r| r.ref }.should_not include(@host1.ref)
         end
 
-        it "should not include the skipped users", :'fails_on_ruby_1.9.2' => true, :fails_on_windows => true do
+        it "should not include the skipped users", :'fails_on_ruby_1.9.2' => true do
           res = Puppet::Type.type(:resources).new :name => :user, :purge => true
           res.catalog = Puppet::Resource::Catalog.new
 
@@ -72,9 +72,9 @@ describe resources do
           end
         end
 
-        describe "when the instance's do not have an ensure property", :fails_on_windows => true do
+        describe "when the instance's do not have an ensure property" do
           it "should not be included in the generated resources" do
-            @no_ensure_resource = Puppet::Type.type(:exec).new(:name => '/usr/bin/env echo')
+            @no_ensure_resource = Puppet::Type.type(:exec).new(:name => "#{File.expand_path('/usr/bin/env')} echo")
             Puppet::Type.type(:host).stubs(:instances).returns [@no_ensure_resource]
             @resources.generate.collect { |r| r.ref }.should_not include(@no_ensure_resource.ref)
           end

data/spec/unit/type/scheduled_task_spec.rb

@@ -0,0 +1,102 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+describe Puppet::Type.type(:scheduled_task), :if => Puppet.features.microsoft_windows? do
+
+  it 'should use name as the namevar' do
+    described_class.new(
+      :title   => 'Foo',
+      :command => 'C:\Windows\System32\notepad.exe'
+    ).name.must == 'Foo'
+  end
+
+  describe 'when setting the command' do
+    it 'should accept an absolute path to the command' do
+      described_class.new(:name => 'Test Task', :command => 'C:\Windows\System32\notepad.exe')[:command].should == 'C:\Windows\System32\notepad.exe'
+    end
+
+    it 'should fail if the path to the command is not absolute' do
+      expect {
+        described_class.new(:name => 'Test Task', :command => 'notepad.exe')
+      }.to raise_error(
+        Puppet::Error,
+        /Parameter command failed: Must be specified using an absolute path\./
+      )
+    end
+  end
+
+  describe 'when setting the command arguments' do
+    it 'should fail if provided an array' do
+      expect {
+        described_class.new(
+          :name      => 'Test Task',
+          :command   => 'C:\Windows\System32\notepad.exe',
+          :arguments => ['/a', '/b', '/c']
+        )
+      }.to raise_error(
+        Puppet::Error,
+        /Parameter arguments failed: Must be specified as a single string/
+      )
+    end
+
+    it 'should accept a string' do
+      described_class.new(
+        :name      => 'Test Task',
+        :command   => 'C:\Windows\System32\notepad.exe',
+        :arguments => '/a /b /c'
+      )[:arguments].should == ['/a /b /c']
+    end
+
+    it 'should allow not specifying any command arguments' do
+      described_class.new(
+        :name    => 'Test Task',
+        :command => 'C:\Windows\System32\notepad.exe'
+      )[:arguments].should_not be
+    end
+  end
+
+  describe 'when setting whether the task is enabled or not' do
+  end
+
+  describe 'when setting the working directory' do
+    it 'should accept an absolute path to the working directory' do
+      described_class.new(
+        :name        => 'Test Task',
+        :command     => 'C:\Windows\System32\notepad.exe',
+        :working_dir => 'C:\Windows\System32'
+      )[:working_dir].should == 'C:\Windows\System32'
+    end
+
+    it 'should fail if the path to the working directory is not absolute' do
+      expect {
+        described_class.new(
+          :name        => 'Test Task',
+          :command     => 'C:\Windows\System32\notepad.exe',
+          :working_dir => 'Windows\System32'
+        )
+      }.to raise_error(
+        Puppet::Error,
+        /Parameter working_dir failed: Must be specified using an absolute path/
+      )
+    end
+
+    it 'should allow not specifying any working directory' do
+      described_class.new(
+        :name    => 'Test Task',
+        :command => 'C:\Windows\System32\notepad.exe'
+      )[:working_dir].should_not be
+    end
+  end
+
+  describe 'when setting the trigger' do
+    it 'should delegate to the provider to validate the trigger' do
+      described_class.defaultprovider.any_instance.expects(:validate_trigger).returns(true)
+
+      described_class.new(
+        :name    => 'Test Task',
+        :command => 'C:\Windows\System32\notepad.exe',
+        :trigger => {'schedule' => 'once', 'start_date' => '2011-09-16', 'start_time' => '13:20'}
+      )
+    end
+  end
+end