puppet 3.4.3 → 3.5.0.rc1

data/spec/unit/provider/user/useradd_spec.rb

@@ -25,17 +25,16 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   let(:shadow_entry) {
     return unless Puppet.features.libshadow?
-    Struct::PasswdEntry.new(
-      'myuser', # login name
-      '$6$FvW8Ib8h$qQMI/CR9m.QzIicZKutLpBgCBBdrch1IX0rTnxuI32K1pD9.RXZrmeKQlaC.RzODNuoUtPPIyQDufunvLOQWF0', # encrypted password
-      15573, # date of last password change
-      10,    # minimum password age
-      20,    # maximum password age
-      7,     # password warning period
-      -1,    # password inactivity period
-      15706, # account expiration date
-      -1     # reserved field
-    )
+    entry = Struct::PasswdEntry.new
+    entry[:sp_namp]   = 'myuser' # login name
+    entry[:sp_pwdp]   = '$6$FvW8Ib8h$qQMI/CR9m.QzIicZKutLpBgCBBdrch1IX0rTnxuI32K1pD9.RXZrmeKQlaC.RzODNuoUtPPIyQDufunvLOQWF0' # encrypted password
+    entry[:sp_lstchg] = 15573    # date of last password change
+    entry[:sp_min]    = 10       # minimum password age
+    entry[:sp_max]    = 20       # maximum password age
+    entry[:sp_warn]   = 7        # password warning period
+    entry[:sp_inact]  = -1       # password inactivity period
+    entry[:sp_expire] = 15706    # account expiration date
+    entry
   }
 
   describe "#create" do
@@ -93,9 +92,9 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         provider.expects(:execute).with(includes('/usr/sbin/luseradd'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
         provider.create
       end
- 
+
       it "should NOT use -o when allowdupe=true" do
-        resource[:allowdupe] = :true 
+        resource[:allowdupe] = :true
         provider.expects(:execute).with(Not(includes('-o')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
         provider.create
       end
@@ -110,13 +109,13 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         resource[:groups] = ['group1', 'group2']
         provider.expects(:execute).with(Not(includes("-G")), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
         provider.expects(:execute).with(includes('/usr/sbin/usermod'))
-        provider.create 
+        provider.create
       end
 
       it "should not use -m when managehome set" do
         resource[:managehome] = :true
         provider.expects(:execute).with(Not(includes('-m')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.create 
+        provider.create
       end
 
       it "should not use -e with luseradd, should call usermod with -e after luseradd when expiry is set" do
@@ -125,6 +124,22 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         provider.expects(:execute).with(all_of(includes('/usr/sbin/usermod'), includes('-e')))
         provider.create
       end
+
+      it "should use userdel to delete users" do
+        resource[:ensure] = :absent
+        provider.stubs(:exists?).returns(true)
+        provider.expects(:execute).with(includes('/usr/sbin/userdel'))
+        provider.delete
+      end
+    end
+
+    describe "on systems that allow to set shell" do
+      it "should trigger shell validation" do
+        resource[:shell] = '/bin/bash'
+        provider.expects(:check_valid_shell)
+        provider.expects(:execute).with(includes('-s'), kind_of(Hash))
+        provider.create
+      end
     end
 
   end
@@ -399,4 +414,17 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       provider.passcmd.must == ['/usr/bin/chage','-m',123,'-M',999,'myuser']
     end
   end
+
+  describe "#check_valid_shell" do
+    it "should raise an error if shell does not exist" do
+      resource[:shell] = 'foo/bin/bash'
+      lambda { provider.check_valid_shell }.should raise_error(Puppet::Error, /Shell foo\/bin\/bash must exist/)
+    end
+
+    it "should raise an error if the shell is not executable" do
+      resource[:shell] = 'LICENSE'
+      lambda { provider.check_valid_shell }.should raise_error(Puppet::Error, /Shell LICENSE must be executable/)
+    end
+  end
+
 end

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

@@ -122,6 +122,7 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
   end
 
   it 'should be able to test whether a user exists' do
+    Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
     Puppet::Util::ADSI.stubs(:connect).returns stub('connection')
     provider.should be_exists
 

data/spec/unit/provider/yumrepo/inifile_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe Puppet::Type.type(:yumrepo).provider(:inifile) do
+
+  let(:virtual_inifile) { stub('virtual inifile') }
+
+  before :each do
+    described_class.stubs(:virtual_inifile).returns(virtual_inifile)
+  end
+
+  describe 'self.instances' do
+    let(:updates_section) do
+      stub('inifile updates section',
+           :name => 'updates',
+           :entries => {'name' => 'updates', 'enabled' => '1', 'descr' => 'test updates'})
+    end
+
+    it 'finds any existing sections' do
+      virtual_inifile.expects(:each_section).yields(updates_section)
+
+      providers = described_class.instances
+      providers.should have(1).items
+      providers[0].name.should == 'updates'
+      providers[0].enabled.should == '1'
+    end
+  end
+
+  describe "methods used by ensurable" do
+
+    let(:type) do
+      Puppet::Type.type(:yumrepo).new(
+        :name     => 'puppetlabs-products',
+        :ensure   => :present,
+        :baseurl  => 'http://yum.puppetlabs.com/el/6/products/$basearch',
+        :descr    => 'Puppet Labs Products El 6 - $basearch',
+        :enabled  => '1',
+        :gpgcheck => '1',
+        :gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs'
+      )
+    end
+
+    let(:provider) { type.provider }
+
+    let(:puppetlabs_section) { stub('inifile puppetlabs section', :name => 'puppetlabs-products') }
+
+    it "#create sets the yumrepo properties on the according section" do
+      described_class.expects(:section).returns(puppetlabs_section)
+      puppetlabs_section.expects(:[]=).with('baseurl', 'http://yum.puppetlabs.com/el/6/products/$basearch')
+      puppetlabs_section.expects(:[]=).with('descr', 'Puppet Labs Products El 6 - $basearch')
+      puppetlabs_section.expects(:[]=).with('enabled', '1')
+      puppetlabs_section.expects(:[]=).with('gpgcheck', '1')
+      puppetlabs_section.expects(:[]=).with('gpgkey', 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs')
+
+      provider.create
+    end
+
+    it "#exists? checks if the repo has been marked as present" do
+      described_class.stubs(:section).returns(stub(:[]= => nil))
+      provider.create
+      expect(provider).to be_exist
+    end
+
+    it "#destroy deletes the associated ini file section" do
+      described_class.expects(:section).returns(puppetlabs_section)
+      puppetlabs_section.expects(:destroy=).with(true)
+      provider.destroy
+    end
+  end
+
+  describe 'reposdir' do
+    let(:defaults) { ['/etc/yum.repos.d', '/etc/yum/repos.d'] }
+
+    before do
+      Puppet::FileSystem.stubs(:exist?).with('/etc/yum.repos.d').returns(true)
+      Puppet::FileSystem.stubs(:exist?).with('/etc/yum/repos.d').returns(true)
+    end
+
+    it "returns the default directories if yum.conf doesn't contain a `reposdir` entry" do
+      described_class.stubs(:find_conf_value).with('reposdir', '/etc/yum.conf')
+      described_class.reposdir('/etc/yum.conf').should == defaults
+    end
+
+    it "includes the directory specified by the yum.conf 'reposdir' entry when the directory is present" do
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(true)
+
+      described_class.expects(:find_conf_value).with('reposdir', '/etc/yum.conf').returns "/etc/yum/extra.repos.d"
+      described_class.reposdir('/etc/yum.conf').should include("/etc/yum/extra.repos.d")
+    end
+
+    it "doesn't the directory specified by the yum.conf 'reposdir' entry when the directory is absent" do
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(false)
+
+      described_class.expects(:find_conf_value).with('reposdir', '/etc/yum.conf').returns "/etc/yum/extra.repos.d"
+      described_class.reposdir('/etc/yum.conf').should_not include("/etc/yum/extra.repos.d")
+    end
+
+    it "raises an entry if none of the specified repo directories exist" do
+      Puppet::FileSystem.unstub(:exist?)
+      Puppet::FileSystem.stubs(:exist?).returns false
+
+      described_class.stubs(:find_conf_value).with('reposdir', '/etc/yum.conf')
+      expect { described_class.reposdir('/etc/yum.conf') }.to raise_error('No yum directories were found on the local filesystem')
+    end
+  end
+end

data/spec/unit/provider/zone/solaris_spec.rb

@@ -138,7 +138,7 @@ net:
     it "should not require path if sysidcfg is specified" do
       resource[:path] = '/mypath'
       resource[:sysidcfg] = 'dummy'
-      Puppet::FileSystem::File.stubs(:exist?).with('/mypath/root/etc/sysidcfg').returns true
+      Puppet::FileSystem.stubs(:exist?).with('/mypath/root/etc/sysidcfg').returns true
       File.stubs(:directory?).with('/mypath/root/etc').returns true
       provider.expects(:zoneadm).with(:boot)
       provider.start

data/spec/unit/provider_spec.rb

@@ -155,19 +155,6 @@ describe Puppet::Provider do
     Puppet::Provider.should respond_to(:specificity)
   end
 
-  it "should consider two defaults to be higher specificity than one default" do
-    one = provider_of do
-      defaultfor :osfamily => "solaris"
-    end
-
-    two = provider_of do
-      defaultfor :osfamily => "solaris", :operatingsystemrelease => "5.10"
-    end
-
-    two.specificity.should > one.specificity
-  end
-
-
   it "should be Comparable" do
     res = Puppet::Type.type(:notify).new(:name => "res")
 
@@ -301,6 +288,53 @@ describe Puppet::Provider do
       subject.name.should == type.defaultprovider.name
     end
 
+    describe "when there are multiple defaultfor's of equal specificity" do
+      before :each do
+        subject.defaultfor :operatingsystem => :os1
+        subject.defaultfor :operatingsystem => :os2
+      end
+
+      let(:alternate) { type.provide(:alternate) {} }
+
+      it "should be default for the first defaultfor" do
+        Facter.expects(:value).with(:operatingsystem).at_least_once.returns :os1
+
+        provider.should be_default
+        alternate.should_not be_default
+      end
+
+      it "should be default for the last defaultfor" do
+        Facter.expects(:value).with(:operatingsystem).at_least_once.returns :os2
+
+        provider.should be_default
+        alternate.should_not be_default
+      end
+    end
+
+    describe "when there are multiple defaultfor's with different specificity" do
+      before :each do
+        subject.defaultfor :operatingsystem => :os1
+        subject.defaultfor :operatingsystem => :os2, :operatingsystemmajrelease => "42"
+      end
+
+      let(:alternate) { type.provide(:alternate) {} }
+
+      it "should be default for a more specific, but matching, defaultfor" do
+        Facter.expects(:value).with(:operatingsystem).at_least_once.returns :os2
+        Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns "42"
+
+        provider.should be_default
+        alternate.should_not be_default
+      end
+
+      it "should be default for a less specific, but matching, defaultfor" do
+        Facter.expects(:value).with(:operatingsystem).at_least_once.returns :os1
+
+        provider.should be_default
+        alternate.should_not be_default
+      end
+    end
+
     it "should consider any true value enough to be default" do
       alternate = type.provide(:alternate) {}
 
@@ -311,13 +345,16 @@ describe Puppet::Provider do
       alternate.should_not be_default
     end
 
-    it "should not be default if the confine doesn't match" do
+    it "should not be default if the defaultfor doesn't match" do
       subject.should_not be_default
       subject.defaultfor :operatingsystem => :one
       subject.should_not be_default
     end
 
     it "should consider two defaults to be higher specificity than one default" do
+      Facter.expects(:value).with(:osfamily).at_least_once.returns "solaris"
+      Facter.expects(:value).with(:operatingsystemrelease).at_least_once.returns "5.10"
+
       one = type.provide(:one) do
         defaultfor :osfamily => "solaris"
       end
@@ -335,11 +372,34 @@ describe Puppet::Provider do
 
       child.specificity.should > parent.specificity
     end
+
+    describe "using a :feature key" do
+      before :each do
+        Puppet.features.add(:yay) do true end
+        Puppet.features.add(:boo) do false end
+      end
+
+      it "is default for an available feature" do
+        one = type.provide(:one) do
+          defaultfor :feature => :yay
+        end
+
+        one.should be_default
+      end
+
+      it "is not default for a missing feature" do
+        two = type.provide(:two) do
+          defaultfor :feature => :boo
+        end
+
+        two.should_not be_default
+      end
+    end
   end
 
   context "provider commands" do
     it "should raise for unknown commands" do
-      expect { subject.command(:something) }.to raise_error Puppet::DevError
+      expect { subject.command(:something) }.to raise_error(Puppet::DevError)
     end
 
     it "should handle command inheritance" do
@@ -349,10 +409,10 @@ describe Puppet::Provider do
       command = Puppet::Util.which('sh') || Puppet::Util.which('cmd.exe')
       parent.commands :sh => command
 
-      Puppet::FileSystem::File.exist?(parent.command(:sh)).should be_true
+      Puppet::FileSystem.exist?(parent.command(:sh)).should be_true
       parent.command(:sh).should =~ /#{Regexp.escape(command)}$/
 
-      Puppet::FileSystem::File.exist?(child.command(:sh)).should be_true
+      Puppet::FileSystem.exist?(child.command(:sh)).should be_true
       child.command(:sh).should =~ /#{Regexp.escape(command)}$/
     end
 
@@ -381,7 +441,7 @@ describe Puppet::Provider do
       end
 
       it "should define a wrapper for the command" do
-        subject.should respond_to :cmd
+        subject.should respond_to(:cmd)
       end
 
       it "should return nil if the command is requested" do
@@ -389,7 +449,7 @@ describe Puppet::Provider do
       end
 
       it "should raise if the command is invoked" do
-        expect { subject.cmd }.to raise_error Puppet::Error, /Command cmd is missing/
+        expect { subject.cmd }.to raise_error(Puppet::Error, /Command cmd is missing/)
       end
     end
   end
@@ -440,45 +500,43 @@ describe Puppet::Provider do
 
   context "mk_resource_methods" do
     before :each do
-      type.newproperty(:prop1)
-      type.newproperty(:prop2)
-      type.newparam(:param1)
-      type.newparam(:param2)
+      type.newproperty(:prop)
+      type.newparam(:param)
+      provider.mk_resource_methods
     end
 
-    fields = %w{prop1 prop2 param1 param2}
+    let(:instance) { provider.new(nil) }
 
-    fields.each do |name|
-      it "should add getter methods for #{name}" do
-        expect { subject.mk_resource_methods }.
-          to change { subject.method_defined?(name) }.
-          from(false).to(true)
-      end
+    it "defaults to :absent" do
+      expect(instance.prop).to eq(:absent)
+      expect(instance.param).to eq(:absent)
+    end
 
-      it "should add setter methods for #{name}" do
-        method = name + '='
-        expect { subject.mk_resource_methods }.
-          to change { subject.method_defined?(name) }.
-          from(false).to(true)
-      end
+    it "should update when set" do
+      instance.prop = 'hello'
+      instance.param = 'goodbye'
+
+      expect(instance.prop).to eq('hello')
+      expect(instance.param).to eq('goodbye')
     end
 
-    context "with an instance" do
-      subject { provider.mk_resource_methods; provider.new(nil) }
+    it "treats nil the same as absent" do
+      instance.prop = "value"
+      instance.param = "value"
 
-      fields.each do |name|
-        context name do
-          it "should default to :absent" do
-            subject.send(name).should == :absent
-          end
+      instance.prop = nil
+      instance.param = nil
 
-          it "should update when set" do
-            expect { subject.send(name + '=', "hello") }.
-              to change { subject.send(name) }.
-              from(:absent).to("hello")
-          end
-        end
-      end
+      expect(instance.prop).to eq(:absent)
+      expect(instance.param).to eq(:absent)
+    end
+
+    it "preserves false as false" do
+      instance.prop = false
+      instance.param = false
+
+      expect(instance.prop).to eq(false)
+      expect(instance.param).to eq(false)
     end
   end
 
@@ -545,18 +603,18 @@ describe Puppet::Provider do
 
         subject { provider }
 
-        it { should respond_to :has_features }
-        it { should respond_to :has_feature }
+        it { should respond_to(:has_features) }
+        it { should respond_to(:has_feature) }
 
         context "provider class" do
-          it { should respond_to :nomethods? }
+          it { should respond_to(:nomethods?) }
           it { should_not be_nomethods }
 
-          it { should respond_to :numeric? }
+          it { should respond_to(:numeric?) }
           it { subject.send(numeric?, be_numeric) }
           it { subject.send(numeric?, be_satisfies(:numeric)) }
 
-          it { should respond_to :alpha? }
+          it { should respond_to(:alpha?) }
           it { subject.send(alpha?, be_alpha) }
           it { subject.send(alpha?, be_satisfies(:alpha)) }
         end
@@ -564,11 +622,11 @@ describe Puppet::Provider do
         context "provider instance" do
           subject { provider.new }
 
-          it { should respond_to :numeric? }
+          it { should respond_to(:numeric?) }
           it { subject.send(numeric?, be_numeric) }
           it { subject.send(numeric?, be_satisfies(:numeric)) }
 
-          it { should respond_to :alpha? }
+          it { should respond_to(:alpha?) }
           it { subject.send(alpha?, be_alpha) }
           it { subject.send(alpha?, be_satisfies(:alpha)) }
         end
@@ -580,11 +638,11 @@ describe Puppet::Provider do
         type.feature :undemanding, ''
       end
 
-      it { should respond_to :undemanding? }
+      it { should respond_to(:undemanding?) }
 
       context "when the feature is not declared" do
         it { should_not be_undemanding }
-        it { should_not be_satisfies :undemanding }
+        it { should_not be_satisfies(:undemanding) }
       end
 
       context "when the feature is declared" do
@@ -593,7 +651,7 @@ describe Puppet::Provider do
         end
 
         it { should be_undemanding }
-        it { should be_satisfies :undemanding }
+        it { should be_satisfies(:undemanding) }
       end
     end
 
@@ -618,13 +676,13 @@ describe Puppet::Provider do
       }.each do |name, data|
         data[:yes].each do |param|
           it "should support #{param} with provider #{name}" do
-            providers[name].should be_supports_parameter param
+            providers[name].should be_supports_parameter(param)
           end
         end
 
         data[:no].each do |param|
           it "should not support #{param} with provider #{name}" do
-            providers[name].should_not be_supports_parameter param
+            providers[name].should_not be_supports_parameter(param)
           end
         end
       end