puppet 4.1.0 → 4.2.0

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

@@ -258,7 +258,7 @@ describe provider_class do
         @provider.expects(:pip).with('freeze').raises(NoMethodError)
         @provider.expects(:which).with(pip_cmd).returns(nil)
         expect { @provider.method(:lazy_pip).call("freeze") }.
-          to raise_error(NoMethodError, 'Could not locate the pip command.')
+          to raise_error(NoMethodError, "Could not locate the #{pip_cmd} command.")
       end
 
     end

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

@@ -77,6 +77,7 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
       end
 
       it "should use an http proxy host and port if specified" do
+        Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
         Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
         Puppet::Util::HttpProxy.expects(:http_proxy_port).returns 'some_port'
         Dir.expects(:mktmpdir).returns tmpdir
@@ -92,6 +93,7 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
       end
 
       it "should use an http proxy host only if specified" do
+        Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
         Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
         Puppet::Util::HttpProxy.expects(:http_proxy_port).returns nil
         Dir.expects(:mktmpdir).returns tmpdir
@@ -106,6 +108,22 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
         provider.install
       end
 
+      it "should not use the configured proxy if no_proxy contains a match for the destination" do
+        Puppet::Util::HttpProxy.expects(:no_proxy?).returns true
+        Puppet::Util::HttpProxy.expects(:http_proxy_host).never
+        Puppet::Util::HttpProxy.expects(:http_proxy_port).never
+        Dir.expects(:mktmpdir).returns tmpdir
+        Dir.stubs(:entries).returns ["foo.pkg"]
+        described_class.expects(:curl).with do |*args|
+          expect(args).not_to be_include 'some_host:some_port'
+          expect(args).not_to be_include '--proxy'
+          true
+        end
+        described_class.stubs(:hdiutil).returns fake_hdiutil_plist
+        described_class.expects(:installpkg)
+
+        provider.install
+      end
     end
   end
 

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

@@ -41,7 +41,7 @@ describe provider_class do
 
   describe "#instances" do
     let(:pkgin_ls_output) do
-      "zlib-1.2.3           General purpose data compression library\nzziplib-0.13.59      Library for ZIP archive handling\n"
+      "zlib-1.2.3;General purpose data compression library\nzziplib-0.13.59;Library for ZIP archive handling\n"
     end
 
     before do
@@ -72,7 +72,7 @@ describe provider_class do
 
     context "when the package is installed" do
       let(:pkgin_search_output) do
-        "vim-7.2.446 =        Vim editor (vi clone) without GUI\nvim-share-7.2.446 =  Data files for the vim editor (vi clone)\n\n=: package is installed and up-to-date\n<: package is installed but newer version is available\n>: installed package has a greater version than available package\n"
+        "vim-7.2.446;=;Vim editor (vi clone) without GUI\nvim-share-7.2.446;=;Data files for the vim editor (vi clone)\n\n=: package is installed and up-to-date\n<: package is installed but newer version is available\n>: installed package has a greater version than available package\n"
       end
 
       it "returns installed version" do
@@ -83,7 +83,7 @@ describe provider_class do
 
     context "when the package is out of date" do
       let(:pkgin_search_output) do
-        "vim-7.2.447 <        Vim editor (vi clone) without GUI\nvim-share-7.2.447 <  Data files for the vim editor (vi clone)\n\n=: package is installed and up-to-date\n<: package is installed but newer version is available\n>: installed package has a greater version than available package\n"
+        "vim-7.2.447;<;Vim editor (vi clone) without GUI\nvim-share-7.2.447;<;Data files for the vim editor (vi clone)\n\n=: package is installed and up-to-date\n<: package is installed but newer version is available\n>: installed package has a greater version than available package\n"
       end
 
       it "returns the version to be installed" do
@@ -93,7 +93,7 @@ describe provider_class do
 
     context "when the package is ahead of date" do
       let(:pkgin_search_output) do
-        "vim-7.2.446 >        Vim editor (vi clone) without GUI\nvim-share-7.2.446 >  Data files for the vim editor (vi clone)\n\n=: package is installed and up-to-date\n<: package is installed but newer version is available\n>: installed package has a greater version than available package\n"
+        "vim-7.2.446;>;Vim editor (vi clone) without GUI\nvim-share-7.2.446;>;Data files for the vim editor (vi clone)\n\n=: package is installed and up-to-date\n<: package is installed but newer version is available\n>: installed package has a greater version than available package\n"
       end
 
       it "returns current version" do
@@ -105,12 +105,12 @@ describe provider_class do
     context "when multiple candidates do exists" do
       let(:pkgin_search_output) do
         <<-SEARCH
-vim-7.1 >            Vim editor (vi clone) without GUI
-vim-share-7.1 >      Data files for the vim editor (vi clone)
-vim-7.2.446 =        Vim editor (vi clone) without GUI
-vim-share-7.2.446 =  Data files for the vim editor (vi clone)
-vim-7.3 <            Vim editor (vi clone) without GUI
-vim-share-7.3 <      Data files for the vim editor (vi clone)
+vim-7.1;>;Vim editor (vi clone) without GUI
+vim-share-7.1;>;Data files for the vim editor (vi clone)
+vim-7.2.446;=;Vim editor (vi clone) without GUI
+vim-share-7.2.446;=;Data files for the vim editor (vi clone)
+vim-7.3;<;Vim editor (vi clone) without GUI
+vim-share-7.3;<;Data files for the vim editor (vi clone)
 
 =: package is installed and up-to-date
 <: package is installed but newer version is available
@@ -137,7 +137,7 @@ SEARCH
 
   describe "#parse_pkgin_line" do
     context "with an installed package" do
-      let(:package) { "vim-7.2.446 =        Vim editor (vi clone) without GUI" }
+      let(:package) { "vim-7.2.446;=;Vim editor (vi clone) without GUI" }
 
       it "extracts the name and status" do
         expect(provider_class.parse_pkgin_line(package)).to eq({ :name => "vim" ,
@@ -147,7 +147,7 @@ SEARCH
     end
 
     context "with an installed package with a hyphen in the name" do
-      let(:package) { "ruby18-puppet-0.25.5nb1 > Configuration management framework written in Ruby" }
+      let(:package) { "ruby18-puppet-0.25.5nb1;>;Configuration management framework written in Ruby" }
 
       it "extracts the name and status" do
         expect(provider_class.parse_pkgin_line(package)).to eq({ :name =>  "ruby18-puppet",
@@ -156,8 +156,18 @@ SEARCH
       end
     end
 
+    context "with an installed package with a hyphen in the name and package description" do
+      let(:package) { "ruby200-facter-2.4.3nb1;=;Cross-platform Ruby library for retrieving facts from OS" }
+
+      it "extracts the name and status" do
+        expect(provider_class.parse_pkgin_line(package)).to eq({ :name =>  "ruby200-facter",
+                                                             :status => "=" ,
+                                                             :ensure => "2.4.3nb1" })
+      end
+    end
+
     context "with a package not yet installed" do
-      let(:package) { "vim-7.2.446          Vim editor (vi clone) without GUI" }
+      let(:package) { "vim-7.2.446;Vim editor (vi clone) without GUI" }
 
       it "extracts the name and status" do
         expect(provider_class.parse_pkgin_line(package)).to eq({ :name => "vim" ,

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

@@ -471,6 +471,17 @@ describe provider_class do
         expect(output['libpcap']).to eq([{:name => 'libpcap', :epoch => '14', :version => '1.4.0', :release => '1.20130826git2dbcaa1.el6', :arch => 'x86_64'}])
       end
     end
+
+    describe "with obsoleted packages" do
+      let(:check_update) { File.read(my_fixture('yum-check-update-obsoletes.txt')) }
+      let(:output) { described_class.parse_updates(check_update) }
+
+      it "ignores all entries including and after 'Obsoleting Packages'" do
+        expect(output).not_to include("Obsoleting")
+        expect(output).not_to include("NetworkManager-bluetooth.x86_64")
+        expect(output).not_to include("1:1.0.0-14.git20150121.b4ea599c.el7")
+      end
+    end
   end
 
   describe "parsing a line from yum check-update" do

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

@@ -0,0 +1,130 @@
+#!/usr/bin/env ruby
+
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:service).provider(:bsd)
+
+describe provider_class, :unless => Puppet.features.microsoft_windows? do
+  before :each do
+    Puppet::Type.type(:service).stubs(:defaultprovider).returns described_class
+    Facter.stubs(:value).with(:operatingsystem).returns :netbsd
+    Facter.stubs(:value).with(:osfamily).returns 'NetBSD'
+    described_class.stubs(:defpath).returns('/etc/rc.conf.d')
+    @provider = provider_class.new
+    @provider.stubs(:initscript)
+  end
+
+  describe "#instances" do
+    it "should have an instances method" do
+      expect(described_class).to respond_to :instances
+    end
+
+    it "should use defpath" do
+      expect(described_class.instances).to be_all { |provider| provider.get(:path) == described_class.defpath }
+    end
+  end
+
+  describe "#disable" do
+    it "should have a disable method" do
+      expect(@provider).to respond_to(:disable)
+    end
+
+    it "should remove a service file to disable" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      Puppet::FileSystem.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(true)
+      Puppet::FileSystem.expects(:exist?).with('/etc/rc.conf.d/sshd').returns(true)
+      File.stubs(:delete).with('/etc/rc.conf.d/sshd')
+      provider.disable
+    end
+
+    it "should not remove a service file if it doesn't exist" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      File.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(false)
+      Puppet::FileSystem.expects(:exist?).with('/etc/rc.conf.d/sshd').returns(false)
+      provider.disable
+    end
+  end
+
+  describe "#enable" do
+    it "should have an enable method" do
+      expect(@provider).to respond_to(:enable)
+    end
+
+    it "should set the proper contents to enable" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      Dir.stubs(:mkdir).with('/etc/rc.conf.d')
+      fh = stub 'fh'
+      File.stubs(:open).with('/etc/rc.conf.d/sshd', File::WRONLY | File::APPEND | File::CREAT, 0644).yields(fh)
+      fh.expects(:<<).with("sshd_enable=\"YES\"\n")
+      provider.enable
+    end
+
+    it "should set the proper contents to enable when disabled" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      Dir.stubs(:mkdir).with('/etc/rc.conf.d')
+      File.stubs(:read).with('/etc/rc.conf.d/sshd').returns("sshd_enable=\"NO\"\n")
+      fh = stub 'fh'
+      File.stubs(:open).with('/etc/rc.conf.d/sshd', File::WRONLY | File::APPEND | File::CREAT, 0644).yields(fh)
+      fh.expects(:<<).with("sshd_enable=\"YES\"\n")
+      provider.enable
+    end
+  end
+
+  describe "#enabled?" do
+    it "should have an enabled? method" do
+      expect(@provider).to respond_to(:enabled?)
+    end
+
+    it "should return false if the service file does not exist" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      Puppet::FileSystem.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(false)
+      # File.stubs(:read).with('/etc/rc.conf.d/sshd').returns("sshd_enable=\"NO\"\n")
+      expect(provider.enabled?).to eq(:false)
+    end
+
+    it "should return true if the service file exists" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      Puppet::FileSystem.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(true)
+      # File.stubs(:read).with('/etc/rc.conf.d/sshd').returns("sshd_enable=\"YES\"\n")
+      expect(provider.enabled?).to eq(:true)
+    end
+  end
+
+  describe "#startcmd" do
+    it "should have a startcmd method" do
+      expect(@provider).to respond_to(:startcmd)
+    end
+
+    it "should use the supplied start command if specified" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :start => '/bin/foo'))
+      provider.expects(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
+      provider.start
+    end
+
+    it "should start the serviced directly otherwise" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      provider.expects(:execute).with(['/etc/rc.d/sshd', :onestart], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
+      provider.expects(:search).with('sshd').returns('/etc/rc.d/sshd')
+      provider.start
+    end
+  end
+
+  describe "#stopcmd" do
+    it "should have a stopcmd method" do
+      expect(@provider).to respond_to(:stopcmd)
+    end
+
+    it "should use the supplied stop command if specified" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :stop => '/bin/foo'))
+      provider.expects(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
+      provider.stop
+    end
+
+    it "should stop the serviced directly otherwise" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      provider.expects(:execute).with(['/etc/rc.d/sshd', :onestop], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
+      provider.expects(:search).with('sshd').returns('/etc/rc.d/sshd')
+      provider.stop
+    end
+  end
+end

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

@@ -35,7 +35,10 @@ describe provider_class do
   operatingsystem = [ 'Debian', 'CumulusLinux' ]
   operatingsystem.each do |os|
     it "should be the default provider on #{os}" do
-      Facter.expects(:value).with(:operatingsystem).returns(os)
+      Facter.expects(:value).with(:operatingsystem).at_least_once.returns(os)
+      if os == 'Debian'
+        Facter.expects(:value).with(:operatingsystemmajrelease).returns('7')
+      end
       expect(provider_class.default?).to be_truthy
     end
   end
@@ -119,6 +122,14 @@ describe provider_class do
       it_should_behave_like "manually queries service status", 105
     end
 
+    context "when invoke-rc.d exits with 101 status" do
+      it_should_behave_like "manually queries service status", 101
+    end
+
+    context "when invoke-rc.d exits with 105 status" do
+      it_should_behave_like "manually queries service status", 105
+    end
+
     # pick a range of non-[104.106] numbers, strings and booleans to test with.
     [-100, -1, 0, 1, 100, "foo", "", :true, :false].each do |exitstatus|
       it "should return false when invoke-rc.d exits with #{exitstatus} status" do

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

@@ -44,6 +44,22 @@ OUTPUT
     expect(@provider.rcvar).to eq(['# ntpd', 'ntpd=YES'])
   end
 
+  it 'should parse service names with a description' do
+    @provider.stubs(:execute).returns <<OUTPUT
+# local_unbound : local caching forwarding resolver
+local_unbound_enable="YES"
+OUTPUT
+    expect(@provider.service_name).to eq('local_unbound')
+  end
+
+  it 'should parse service names without a description' do
+    @provider.stubs(:execute).returns <<OUTPUT
+# local_unbound
+local_unbound="YES"
+OUTPUT
+    expect(@provider.service_name).to eq('local_unbound')
+  end
+
   it "should find the right rcvar_value for FreeBSD < 7" do
     @provider.stubs(:rcvar).returns(['# ntpd', 'ntpd_enable=YES'])
 

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

@@ -35,7 +35,7 @@ describe Puppet::Type.type(:service).provider(:systemd) do
       # In Ruby 1.8.7, the order of hash elements differs from 1.9+ and
       # caused short-circuiting of the logic used by default.all? in the
       # provider. As a workaround we need to use stubs() instead of
-      # expects() here. 
+      # expects() here.
       Facter.expects(:value).with(:osfamily).at_least_once.returns(:redhat)
       Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
       Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
@@ -51,7 +51,7 @@ describe Puppet::Type.type(:service).provider(:systemd) do
       expect(described_class.default?).to be_truthy
     end
   end
-  
+
   it "should be the default provider on sles12" do
     Facter.expects(:value).with(:osfamily).at_least_once.returns(:suse)
     Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns("12")
@@ -66,10 +66,40 @@ describe Puppet::Type.type(:service).provider(:systemd) do
 
   it "should not be the default provider on sles11" do
     Facter.expects(:value).with(:osfamily).at_least_once.returns(:suse)
+    Facter.expects(:value).with(:operatingsystem).at_least_once.returns(:suse)
     Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns("11")
     expect(described_class.default?).not_to be_truthy
   end
 
+  it "should not be the default provider on debian7" do
+    Facter.expects(:value).with(:osfamily).at_least_once.returns(:debian)
+    Facter.expects(:value).with(:operatingsystem).at_least_once.returns(:debian)
+    Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns("7")
+    expect(described_class.default?).not_to be_truthy
+  end
+
+  it "should be the default provider on debian8" do
+    Facter.expects(:value).with(:osfamily).at_least_once.returns(:debian)
+    Facter.expects(:value).with(:operatingsystem).at_least_once.returns(:debian)
+    Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns("8")
+    expect(described_class.default?).to be_truthy
+  end
+
+  it "should not be the default provider on ubuntu14.04" do
+    Facter.expects(:value).with(:osfamily).at_least_once.returns(:debian)
+    Facter.expects(:value).with(:operatingsystem).at_least_once.returns(:ubuntu)
+    Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns("14.04")
+    expect(described_class.default?).not_to be_truthy
+  end
+
+  it "should be the default provider on ubuntu15.04" do
+    Facter.expects(:value).with(:osfamily).at_least_once.returns(:debian)
+    Facter.expects(:value).with(:operatingsystem).at_least_once.returns(:ubuntu)
+    Facter.expects(:value).with(:operatingsystemmajrelease).at_least_once.returns("15.04")
+    expect(described_class.default?).to be_truthy
+  end
+
+
   [:enabled?, :enable, :disable, :start, :stop, :status, :restart].each do |method|
     it "should have a #{method} method" do
       expect(provider).to respond_to(method)
@@ -124,20 +154,57 @@ describe Puppet::Type.type(:service).provider(:systemd) do
   describe "#enabled?" do
     it "should return :true if the service is enabled" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
-      provider.expects(:systemctl).with('is-enabled', 'sshd.service').returns 'enabled'
+      provider.expects(:systemctl).with(
+        'show',
+        'sshd.service',
+        '--property', 'LoadState',
+        '--property', 'UnitFileState',
+        '--no-pager'
+      ).returns "LoadState=loaded\nUnitFileState=enabled\n"
       expect(provider.enabled?).to eq(:true)
     end
 
     it "should return :false if the service is disabled" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
-      provider.expects(:systemctl).with('is-enabled', 'sshd.service').raises Puppet::ExecutionFailure, "Execution of '/bin/systemctl is-enabled sshd.service' returned 1: disabled"
+      provider.expects(:systemctl).with(
+        'show',
+        'sshd.service',
+        '--property', 'LoadState',
+        '--property', 'UnitFileState',
+        '--no-pager'
+      ).returns "LoadState=loaded\nUnitFileState=disabled\n"
       expect(provider.enabled?).to eq(:false)
     end
+
+    it "should return :false if the service is masked and the resource is attempting to be disabled" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :enable => false))
+      provider.expects(:systemctl).with(
+        'show',
+        'sshd.service',
+        '--property', 'LoadState',
+        '--property', 'UnitFileState',
+        '--no-pager'
+      ).returns "LoadState=masked\nUnitFileState=\n"
+      expect(provider.enabled?).to eq(:false)
+    end
+
+    it "should return :mask if the service is masked and the resource is attempting to be masked" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :enable => 'mask'))
+      provider.expects(:systemctl).with(
+        'show',
+        'sshd.service',
+        '--property', 'LoadState',
+        '--property', 'UnitFileState',
+        '--no-pager'
+      ).returns "LoadState=masked\nUnitFileState=\n"
+      expect(provider.enabled?).to eq(:mask)
+    end
   end
 
   describe "#enable" do
     it "should run systemctl enable to enable a service" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
+      provider.expects(:systemctl).with('unmask', 'sshd.service')
       provider.expects(:systemctl).with('enable', 'sshd.service')
       provider.enable
     end
@@ -151,6 +218,18 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     end
   end
 
+  describe "#mask" do
+    it "should run systemctl to disable and mask a service" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
+      # :disable is the only call in the provider that uses a symbol instead of
+      # a string.
+      # This should be made consistent in the future and all tests updated.
+      provider.expects(:systemctl).with(:disable, 'sshd.service')
+      provider.expects(:systemctl).with('mask', 'sshd.service')
+      provider.mask
+    end
+  end
+
   # Note: systemd provider does not care about hasstatus or a custom status
   # command. I just assume that it does not make sense for systemd.
   describe "#status" do
@@ -185,8 +264,6 @@ describe Puppet::Type.type(:service).provider(:systemd) do
   end
 
   it "(#16451) has command systemctl without being fully qualified" do
-    expect(described_class.instance_variable_get(:@commands)).
-      to include(:systemctl => 'systemctl')
+    expect(described_class.instance_variable_get(:@commands)).to include(:systemctl => 'systemctl')
   end
-
 end