puppet 2.7.19 → 2.7.20.rc1

data/spec/unit/parser/relationship_spec.rb

@@ -7,6 +7,8 @@ describe Puppet::Parser::Relationship do
   before do
     @source = Puppet::Resource.new(:mytype, "source")
     @target = Puppet::Resource.new(:mytype, "target")
+    @extra_resource  = Puppet::Resource.new(:mytype, "extra")
+    @extra_resource2 = Puppet::Resource.new(:mytype, "extra2")
     @dep = Puppet::Parser::Relationship.new(@source, @target, :relationship)
   end
 
@@ -15,6 +17,8 @@ describe Puppet::Parser::Relationship do
       @catalog = Puppet::Resource::Catalog.new
       @catalog.add_resource(@source)
       @catalog.add_resource(@target)
+      @catalog.add_resource(@extra_resource)
+      @catalog.add_resource(@extra_resource2)
     end
 
     it "should fail if the source resource cannot be found" do
@@ -44,10 +48,30 @@ describe Puppet::Parser::Relationship do
     it "should supplement rather than clobber existing relationship values" do
       @source[:before] = "File[/bar]"
       @dep.evaluate(@catalog)
+      # this test did not work before. It was appending the resources
+      # together as a string
+      (@source[:before].class == Array).should be_true
       @source[:before].should be_include("Mytype[target]")
       @source[:before].should be_include("File[/bar]")
     end
 
+    it "should supplement rather than clobber existing resource relationships" do
+      @source[:before] = @extra_resource
+      @dep.evaluate(@catalog)
+      (@source[:before].class == Array).should be_true
+      @source[:before].should be_include("Mytype[target]")
+      @source[:before].should be_include(@extra_resource)
+    end
+
+    it "should supplement rather than clobber multiple existing resource relationships" do
+      @source[:before] = [@extra_resource, @extra_resource2]
+      @dep.evaluate(@catalog)
+      (@source[:before].class == Array).should be_true
+      @source[:before].should be_include("Mytype[target]")
+      @source[:before].should be_include(@extra_resource)
+      @source[:before].should be_include(@extra_resource2)
+    end
+
     it "should use the collected retargets if the target is a Collector" do
       orig_target = @target
       @target = Puppet::Parser::Collector.new(stub("scope"), :file, "equery", "vquery", :virtual)

data/spec/unit/parser/resource_spec.rb

@@ -52,10 +52,6 @@ describe Puppet::Parser::Resource do
     @known_resource_types.add Puppet::Resource::Type.new(:node, name)
   end
 
-  it "should use the file lookup module" do
-    Puppet::Parser::Resource.ancestors.should be_include(Puppet::FileCollection::Lookup)
-  end
-
   it "should get its environment from its scope" do
     scope = stub 'scope', :source => stub("source"), :namespaces => nil
     scope.expects(:environment).returns("foo").at_least_once

data/spec/unit/parser/scope_spec.rb

@@ -64,11 +64,11 @@ describe Puppet::Parser::Scope do
     end
 
     it "should raise NoMethodError if the method doesn't look like a function" do
-      expect { @scope.sprintf(["%b", 123]) }.should raise_error(NoMethodError)
+      expect { @scope.sprintf(["%b", 123]) }.to raise_error(NoMethodError)
     end
 
     it "should raise NoMethodError if the method looks like a function but doesn't exist" do
-      expect { @scope.function_fake_bs(['cows']) }.should raise_error(NoMethodError)
+      expect { @scope.function_fake_bs(['cows']) }.to raise_error(NoMethodError)
     end
   end
 

data/spec/unit/property_spec.rb

@@ -8,7 +8,12 @@ describe Puppet::Property do
   let :subclass do
     # We need a completely fresh subclass every time, because we modify both
     # class and instance level things inside the tests.
-    subclass = Class.new(Puppet::Property) do @name = :foo end
+    subclass = Class.new(Puppet::Property) do
+      class << self
+        attr_accessor :name
+      end
+      @name = :foo
+    end
     subclass.initvars
     subclass
   end
@@ -361,6 +366,21 @@ describe Puppet::Property do
       lambda { property.set(:foo) }.should raise_error(Puppet::Error)
     end
 
+    it "fails when the provider does not handle the attribute" do
+      subclass.name = "unknown"
+      lambda { property.set(:a_value) }.should raise_error(Puppet::Error)
+    end
+
+    it "propogates the errors about missing methods from the provider" do
+      provider = resource.provider
+      def provider.bad_method=(value)
+        value.this_method_does_not_exist
+      end
+
+      subclass.name = :bad_method
+      lambda { property.set(:a_value) }.should raise_error(NoMethodError, /this_method_does_not_exist/)
+    end
+
     describe "that was defined without a block" do
       it "should call the settor on the provider" do
         subclass.newvalue(:bar)

data/spec/unit/provider/exec/posix_spec.rb

@@ -5,10 +5,11 @@ describe Puppet::Type.type(:exec).provider(:posix) do
   include PuppetSpec::Files
 
   def make_exe
-    command = tmpfile('my_command')
-    FileUtils.touch(command)
-    File.chmod(0755, command)
-    command
+    cmdpath = tmpdir('cmdpath')
+    exepath = tmpfile('my_command', cmdpath)
+    FileUtils.touch(exepath)
+    File.chmod(0755, exepath)
+    exepath
   end
 
   let(:resource) { Puppet::Type.type(:exec).new(:title => File.expand_path('/foo'), :provider => :posix) }
@@ -74,8 +75,8 @@ describe Puppet::Type.type(:exec).provider(:posix) do
       end
 
       it "should fail if the command is in the path but not executable" do
-        command = tmpfile('foo')
-        FileUtils.touch(command)
+        command = make_exe
+        File.chmod(0644, command)
         FileTest.stubs(:executable?).with(command).returns(false)
         resource[:path] = [File.dirname(command)]
         filename = File.basename(command)

data/spec/unit/provider/file/windows_spec.rb

@@ -14,6 +14,8 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet.features.mic
   let(:path) { tmpfile('windows_file_spec') }
   let(:resource) { Puppet::Type.type(:file).new :path => path, :mode => 0777, :provider => described_class.name }
   let(:provider) { resource.provider }
+  let(:sid)      { 'S-1-1-50' }
+  let(:account)  { 'quinn' }
 
   describe "#mode" do
     it "should return a string with the higher-order bits stripped away" do
@@ -47,47 +49,41 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet.features.mic
 
   describe "#id2name" do
     it "should return the name of the user identified by the sid" do
-      result = [stub('user', :name => 'quinn')]
-      Puppet::Util::ADSI.stubs(:execquery).returns(result)
+      Puppet::Util::Windows::Security.expects(:valid_sid?).with(sid).returns(true)
+      Puppet::Util::Windows::Security.expects(:sid_to_name).with(sid).returns(account)
 
-      provider.id2name('S-1-1-50').should == 'quinn'
+      provider.id2name(sid).should == account
     end
 
     it "should return the argument if it's already a name" do
-      provider.id2name('flannigan').should == 'flannigan'
+      Puppet::Util::Windows::Security.expects(:valid_sid?).with(account).returns(false)
+      Puppet::Util::Windows::Security.expects(:sid_to_name).never
+
+      provider.id2name(account).should == account
     end
 
     it "should return nil if the user doesn't exist" do
-      Puppet::Util::ADSI.stubs(:execquery).returns []
+      Puppet::Util::Windows::Security.expects(:valid_sid?).with(sid).returns(true)
+      Puppet::Util::Windows::Security.expects(:sid_to_name).with(sid).returns(nil)
 
-      provider.id2name('S-1-1-50').should == nil
+      provider.id2name(sid).should == nil
     end
   end
 
   describe "#name2id" do
-    it "should return the sid of the user" do
-      Puppet::Util::ADSI.stubs(:execquery).returns [stub('account', :Sid => 'S-1-1-50')]
-
-      provider.name2id('anybody').should == 'S-1-1-50'
-    end
-
-    it "should return the argument if it's already a sid" do
-      provider.name2id('S-1-1-50').should == 'S-1-1-50'
-    end
-
-    it "should return nil if the user doesn't exist" do
-      Puppet::Util::ADSI.stubs(:execquery).returns []
+    it "should delegate to name_to_sid" do
+      Puppet::Util::Windows::Security.expects(:name_to_sid).with(account).returns(sid)
 
-      provider.name2id('someone').should == nil
+      provider.name2id(account).should == sid
     end
   end
 
   describe "#owner" do
     it "should return the sid of the owner if the file does exist" do
       FileUtils.touch(resource[:path])
-      provider.stubs(:get_owner).with(resource[:path]).returns('S-1-1-50')
+      provider.stubs(:get_owner).with(resource[:path]).returns(sid)
 
-      provider.owner.should == 'S-1-1-50'
+      provider.owner.should == sid
     end
 
     it "should return absent if the file doesn't exist" do
@@ -97,23 +93,25 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet.features.mic
 
   describe "#owner=" do
     it "should set the owner to the specified value" do
-      provider.expects(:set_owner).with('S-1-1-50', resource[:path])
-      provider.owner = 'S-1-1-50'
+      provider.expects(:set_owner).with(sid, resource[:path])
+      provider.owner = sid
     end
 
     it "should propagate any errors encountered when setting the owner" do
       provider.stubs(:set_owner).raises(ArgumentError)
 
-      expect { provider.owner = 'S-1-1-50' }.to raise_error(Puppet::Error, /Failed to set owner/)
+      expect {
+        provider.owner = sid
+      }.to raise_error(Puppet::Error, /Failed to set owner/)
     end
   end
 
   describe "#group" do
     it "should return the sid of the group if the file does exist" do
       FileUtils.touch(resource[:path])
-      provider.stubs(:get_group).with(resource[:path]).returns('S-1-1-50')
+      provider.stubs(:get_group).with(resource[:path]).returns(sid)
 
-      provider.group.should == 'S-1-1-50'
+      provider.group.should == sid
     end
 
     it "should return absent if the file doesn't exist" do
@@ -123,14 +121,16 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet.features.mic
 
   describe "#group=" do
     it "should set the group to the specified value" do
-      provider.expects(:set_group).with('S-1-1-50', resource[:path])
-      provider.group = 'S-1-1-50'
+      provider.expects(:set_group).with(sid, resource[:path])
+      provider.group = sid
     end
 
     it "should propagate any errors encountered when setting the group" do
       provider.stubs(:set_group).raises(ArgumentError)
 
-      expect { provider.group = 'S-1-1-50' }.to raise_error(Puppet::Error, /Failed to set group/)
+      expect {
+        provider.group = sid
+      }.to raise_error(Puppet::Error, /Failed to set group/)
     end
   end
 

data/spec/unit/provider/group/groupadd_spec.rb

@@ -1,40 +1,46 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:group).provider(:groupadd)
-
-describe provider_class do
+describe Puppet::Type.type(:group).provider(:groupadd) do
   before do
-    @resource = stub("resource", :name => "mygroup")
-    @provider = provider_class.new(@resource)
+    described_class.stubs(:command).with(:add).returns '/usr/sbin/groupadd'
+    described_class.stubs(:command).with(:delete).returns '/usr/sbin/groupdel'
+    described_class.stubs(:command).with(:modify).returns '/usr/sbin/groupmod'
   end
 
-  it "should add -o when allowdupe is enabled and the group is being created" do
-    @resource.stubs(:should).returns "fakeval"
-    @resource.stubs(:[]).returns "fakeval"
-    @resource.stubs(:system?).returns true
-    @resource.expects(:allowdupe?).returns true
-    @provider.expects(:execute).with { |args| args.include?("-o") }
-
-    @provider.create
+  let(:resource) { Puppet::Type.type(:group).new(:name => 'mygroup', :provider => provider) }
+  let(:provider) { described_class.new(:name => 'mygroup') }
+
+  describe "#create" do
+    it "should add -o when allowdupe is enabled and the group is being created" do
+      resource[:allowdupe] = :true
+      provider.expects(:execute).with(['/usr/sbin/groupadd', '-o', 'mygroup'])
+      provider.create
+    end
+
+    describe "on system that feature system_groups", :if => described_class.system_groups? do
+      it "should add -r when system is enabled and the group is being created" do
+        resource[:system] = :true
+        provider.expects(:execute).with(['/usr/sbin/groupadd', '-r', 'mygroup'])
+        provider.create
+      end
+    end
+
+    describe "on system that do not feature system_groups", :unless => described_class.system_groups? do
+      it "should not add -r when system is enabled and the group is being created" do
+        resource[:system] = :true
+        provider.expects(:execute).with(['/usr/sbin/groupadd', 'mygroup'])
+        provider.create
+      end
+    end
   end
 
-  it "should add -o when allowdupe is enabled and the gid is being modified" do
-    @resource.stubs(:should).returns "fakeval"
-    @resource.stubs(:[]).returns "fakeval"
-    @resource.expects(:allowdupe?).returns true
-    @provider.expects(:execute).with { |args| args.include?("-o") }
-
-    @provider.gid = 150
-  end
-
-  it "should add -r when system is enabled and the group is being created" do
-    @resource.stubs(:should).returns "fakeval"
-    @resource.stubs(:[]).returns "fakeval"
-    @resource.expects(:system?).returns true
-    @resource.stubs(:allowdupe?).returns true
-    @provider.expects(:execute).with { |args| args.include?("-r") }
-
-    @provider.create
+  describe "#gid=" do
+    it "should add -o when allowdupe is enabled and the gid is being modified" do
+      resource[:allowdupe] = :true
+      provider.expects(:execute).with(['/usr/sbin/groupmod', '-g', 150, '-o', 'mygroup'])
+      provider.gid = 150
+    end
   end
 end
+

data/spec/unit/provider/group/windows_adsi_spec.rb

@@ -88,8 +88,8 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
     provider.delete
   end
 
-  it "should report the group's SID as gid" do
-    Puppet::Util::ADSI.expects(:sid_for_account).with('testers').returns('S-1-5-32-547')
+  it "should report the group's SID as gid", :if => Puppet.features.microsoft_windows? do
+    Puppet::Util::Windows::Security.expects(:name_to_sid).with('testers').returns('S-1-5-32-547')
     provider.gid.should == 'S-1-5-32-547'
   end
 

data/spec/unit/provider/package/gem_spec.rb

@@ -99,6 +99,18 @@ describe provider_class do
           })
       provider.latest.should == "3.0"
     end
+
+    it "should list from the specified source repository" do
+      resource[:source] = "http://foo.bar.baz/gems"
+      provider.class.expects(:gemlist).
+        with({:justme => 'myresource', :source => "http://foo.bar.baz/gems"}).
+        returns({
+          :name     => 'myresource',
+          :ensure   => ["3.0"],
+          :provider => :gem,
+          })
+      provider.latest.should == "3.0"
+    end
   end
 
   describe "#instances" do

data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb

@@ -565,29 +565,32 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
     end
   end
 
-  describe '#user_insync?' do
+  describe '#user_insync?', :if => Puppet.features.microsoft_windows? do
     let(:resource) { described_class.new(:name => 'foobar', :command => 'C:\Windows\System32\notepad.exe') }
 
-    before :each do
-      Puppet::Util::ADSI.stubs(:sid_for_account).with('system').returns('SYSTEM SID')
-      Puppet::Util::ADSI.stubs(:sid_for_account).with('joe').returns('SID A')
-      Puppet::Util::ADSI.stubs(:sid_for_account).with('MACHINE\joe').returns('SID A')
-      Puppet::Util::ADSI.stubs(:sid_for_account).with('bob').returns('SID B')
-    end
-
     it 'should consider the user as in sync if the name matches' do
+      Puppet::Util::Windows::Security.expects(:name_to_sid).with('joe').twice.returns('SID A')
+
       resource.should be_user_insync('joe', ['joe'])
     end
 
     it 'should consider the user as in sync if the current user is fully qualified' do
+      Puppet::Util::Windows::Security.expects(:name_to_sid).with('joe').returns('SID A')
+      Puppet::Util::Windows::Security.expects(:name_to_sid).with('MACHINE\joe').returns('SID A')
+
       resource.should be_user_insync('MACHINE\joe', ['joe'])
     end
 
     it 'should consider a current user of the empty string to be the same as the system user' do
+      Puppet::Util::Windows::Security.expects(:name_to_sid).with('system').twice.returns('SYSTEM SID')
+
       resource.should be_user_insync('', ['system'])
     end
 
     it 'should consider different users as being different' do
+      Puppet::Util::Windows::Security.expects(:name_to_sid).with('joe').returns('SID A')
+      Puppet::Util::Windows::Security.expects(:name_to_sid).with('bob').returns('SID B')
+
       resource.should_not be_user_insync('joe', ['bob'])
     end
   end
@@ -1456,7 +1459,7 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
       end
     end
 
-    describe '#user=' do
+    describe '#user=', :if => Puppet.features.microsoft_windows? do
       before :each do
         @mock_task = mock
         @mock_task.responds_like(Win32::TaskScheduler.new)
@@ -1466,7 +1469,7 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
       end
 
       it 'should use nil for user and password when setting the user to the SYSTEM account' do
-        Puppet::Util::ADSI.stubs(:sid_for_account).with('system').returns('SYSTEM SID')
+        Puppet::Util::Windows::Security.stubs(:name_to_sid).with('system').returns('SYSTEM SID')
 
         resource = Puppet::Type.type(:scheduled_task).new(
           :name    => 'Test Task',
@@ -1480,7 +1483,7 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
       end
 
       it 'should use the specified user and password when setting the user to anything other than SYSTEM' do
-        Puppet::Util::ADSI.stubs(:sid_for_account).with('my_user_name').returns('SID A')
+        Puppet::Util::Windows::Security.stubs(:name_to_sid).with('my_user_name').returns('SID A')
 
         resource = Puppet::Type.type(:scheduled_task).new(
           :name     => 'Test Task',

data/spec/unit/provider/service/redhat_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#!/usr/bin/env ruby -S rspec
 #
 # Unit testing for the RedHat service Provider
 #
@@ -45,6 +45,16 @@ describe provider_class, :as_platform => :posix do
     end
   end
 
+  it "(#15797) should use 'on' when calling enable" do
+    provider_class.expects(:chkconfig).with(@resource[:name], :on)
+    @provider.enable
+  end
+
+  it "(#15797) should explicitly turn off the service in all run levels" do
+    provider_class.expects(:chkconfig).with("--level", "0123456", @resource[:name], :off)
+    @provider.disable
+  end
+
   it "should have an enabled? method" do
     @provider.should respond_to(:enabled?)
   end