puppet 6.0.4-universal-darwin → 6.0.5-universal-darwin

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

@@ -1,11 +1,7 @@
-#! /usr/bin/env ruby
-#
-# Unit testing for the debian service provider
-#
-
 require 'spec_helper'
 
-describe 'Puppet::Type::Service::Provider::Debian', unless: Puppet::Util::Platform.jruby? do
+describe 'Puppet::Type::Service::Provider::Debian',
+         unless: Puppet::Util::Platform.jruby? do
   let(:provider_class) { Puppet::Type.type(:service).provider(:debian) }
 
   if Puppet::Util::Platform.windows?
@@ -69,14 +65,14 @@ describe 'Puppet::Type::Service::Provider::Debian', unless: Puppet::Util::Platfo
     expect(@provider).to respond_to(:disable)
   end
 
-  describe "when enabling" do
+  context "when enabling" do
     it "should call update-rc.d twice" do
       @provider.expects(:update_rc).twice
       @provider.enable
     end
   end
 
-  describe "when disabling" do
+  context "when disabling" do
     it "should be able to disable services with newer sysv-rc versions" do
       @provider.stubs(:`).with("dpkg --compare-versions $(dpkg-query -W --showformat '${Version}' sysv-rc) ge 2.88 ; echo $?").returns "0"
 
@@ -95,7 +91,7 @@ describe 'Puppet::Type::Service::Provider::Debian', unless: Puppet::Util::Platfo
     end
   end
 
-  describe "when checking whether it is enabled" do
+  context "when checking whether it is enabled" do
     it "should call Kernel.system() with the appropriate parameters" do
       @provider.expects(:system).with("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start").once
       $CHILD_STATUS.stubs(:exitstatus).returns(0)
@@ -155,7 +151,7 @@ describe 'Puppet::Type::Service::Provider::Debian', unless: Puppet::Util::Platfo
     end
   end
 
-  describe "when checking service status" do
+  context "when checking service status" do
     it "should use the service command" do
       Facter.stubs(:value).with(:operatingsystem).returns('Debian')
       Facter.stubs(:value).with(:operatingsystemmajrelease).returns('8')

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

@@ -1,7 +1,7 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-describe 'Puppet::Type::Service::Provider::Freebsd', unless: Puppet::Util::Platform.jruby? do
+describe 'Puppet::Type::Service::Provider::Freebsd',
+         unless: Puppet::Util::Platform.jruby? do
   let(:provider_class) { Puppet::Type.type(:service).provider(:freebsd) }
 
   before :each do

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

@@ -1,11 +1,7 @@
-#!/usr/bin/env ruby
-#
-# Unit testing for the OpenBSD service provider
-
 require 'spec_helper'
 
 describe 'Puppet::Type::Service::Provider::Openbsd',
-    unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
+         unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
   let(:provider_class) { Puppet::Type.type(:service).provider(:openbsd) }
 
   before :each do
@@ -16,7 +12,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     FileTest.stubs(:executable?).with('/usr/sbin/rcctl').returns true
   end
 
-  describe "#instances" do
+  context "#instances" do
     it "should have an instances method" do
       expect(provider_class).to respond_to :instances
     end
@@ -29,7 +25,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#start" do
+  context "#start" do
     it "should use the supplied start command if specified" do
       provider = provider_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)
@@ -43,7 +39,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#stop" do
+  context "#stop" do
     it "should use the supplied stop command if specified" do
       provider = provider_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)
@@ -57,7 +53,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#status" do
+  context "#status" do
     it "should use the status command from the resource" do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
       provider.expects(:execute).with(['/usr/sbin/rcctl', :get, 'sshd', :status], :failonfail => true, :override_locale => false, :squelch => false, :combine => true).never
@@ -82,7 +78,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#restart" do
+  context "#restart" do
     it "should use the supplied restart command if specified" do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :restart => '/bin/foo'))
       provider.expects(:execute).with(['/usr/sbin/rcctl', '-f', :restart, 'sshd'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true).never
@@ -105,7 +101,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#enabled?" do
+  context "#enabled?" do
     it "should return :true if the service is enabled" do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
       provider_class.stubs(:rcctl).with(:get, 'sshd', :status)
@@ -121,7 +117,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#enable" do
+  context "#enable" do
     it "should run rcctl enable to enable the service" do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
       provider_class.stubs(:rcctl).with(:enable, 'sshd').returns('')
@@ -139,7 +135,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#disable" do
+  context "#disable" do
     it "should run rcctl disable to disable the service" do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
       provider_class.stubs(:rcctl).with(:disable, 'sshd').returns('')
@@ -148,7 +144,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#running?" do
+  context "#running?" do
     it "should run rcctl check to check the service" do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
       provider_class.stubs(:rcctl).with(:check, 'sshd').returns('sshd(ok)')
@@ -171,7 +167,7 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#flags" do
+  context "#flags" do
     it "should return flags when set" do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :flags => '-6'))
       provider_class.stubs(:rcctl).with('get', 'sshd', 'flags').returns('-6')
@@ -194,8 +190,8 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
     end
   end
 
-  describe "#flags=" do
-    it "should run rcctl to set flags", :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
+  context "#flags=" do
+    it "should run rcctl to set flags", unless: Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
       provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
       provider_class.stubs(:rcctl).with(:set, 'sshd', :flags, '-4').returns('')
       provider.expects(:rcctl).with(:set, 'sshd', :flags, '-4')

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

@@ -1,9 +1,7 @@
-#!/usr/bin/env ruby
-
 require 'spec_helper'
 
 describe 'Puppet::Type::Service::Provider::Rcng',
-    :unless => Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
+         unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
   let(:provider_class) { Puppet::Type.type(:service).provider(:rcng) }
 
   before :each do
@@ -15,7 +13,7 @@ describe 'Puppet::Type::Service::Provider::Rcng',
     @provider.stubs(:initscript)
   end
 
-  describe "#enable" do
+  context "#enable" do
     it "should have an enable method" do
       expect(@provider).to respond_to(:enable)
     end

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

@@ -1,11 +1,7 @@
-#! /usr/bin/env ruby
-#
-# Unit testing for the RedHat service Provider
-#
 require 'spec_helper'
 
 describe 'Puppet::Type::Service::Provider::Redhat',
-    :if => Puppet.features.posix? && !Puppet::Util::Platform.jruby? do
+         if: Puppet.features.posix? && !Puppet::Util::Platform.jruby?do
   let(:provider_class) { Puppet::Type.type(:service).provider(:redhat) }
 
   before :each do
@@ -40,7 +36,7 @@ describe 'Puppet::Type::Service::Provider::Redhat',
   end
 
   # test self.instances
-  describe "when getting all service instances" do
+  context "when getting all service instances" do
     before :each do
       @services = ['one', 'two', 'three', 'four', 'kudzu', 'functions', 'halt', 'killall', 'single', 'linuxconf', 'boot', 'reboot']
       @not_services = ['functions', 'halt', 'killall', 'single', 'linuxconf', 'reboot', 'boot']
@@ -78,7 +74,7 @@ describe 'Puppet::Type::Service::Provider::Redhat',
     expect(@provider).to respond_to(:enabled?)
   end
 
-  describe "when checking enabled? on Suse" do
+  context "when checking enabled? on Suse" do
     before :each do
       Facter.expects(:value).with(:osfamily).returns 'Suse'
     end
@@ -132,20 +128,23 @@ describe 'Puppet::Type::Service::Provider::Redhat',
     end
   end
 
-  describe "when checking status" do
-    describe "when hasstatus is :true" do
+  context "when checking status" do
+    context "when hasstatus is :true" do
       before :each do
         @resource.stubs(:[]).with(:hasstatus).returns :true
       end
+
       it "should execute the service script with fail_on_failure false" do
         @provider.expects(:texecute).with(:status, ['/sbin/service', 'myservice', 'status'], false)
         @provider.status
       end
+
       it "should consider the process running if the command returns 0" do
         @provider.expects(:texecute).with(:status, ['/sbin/service', 'myservice', 'status'], false)
         $CHILD_STATUS.stubs(:exitstatus).returns(0)
         expect(@provider.status).to eq(:running)
       end
+
       [-10,-1,1,10].each { |ec|
         it "should consider the process stopped if the command returns something non-0" do
           @provider.expects(:texecute).with(:status, ['/sbin/service', 'myservice', 'status'], false)
@@ -154,11 +153,13 @@ describe 'Puppet::Type::Service::Provider::Redhat',
         end
       }
     end
-    describe "when hasstatus is not :true" do
+
+    context "when hasstatus is not :true" do
       it "should consider the service :running if it has a pid" do
         @provider.expects(:getpid).returns "1234"
         expect(@provider.status).to eq(:running)
       end
+
       it "should consider the service :stopped if it doesn't have a pid" do
         @provider.expects(:getpid).returns nil
         expect(@provider.status).to eq(:stopped)
@@ -166,7 +167,7 @@ describe 'Puppet::Type::Service::Provider::Redhat',
     end
   end
 
-  describe "when restarting and hasrestart is not :true" do
+  context "when restarting and hasrestart is not :true" do
     it "should stop and restart the process with the server script" do
       @provider.expects(:texecute).with(:stop,  ['/sbin/service', 'myservice', 'stop'],  true)
       @provider.expects(:texecute).with(:start, ['/sbin/service', 'myservice', 'start'], true)

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

@@ -1,9 +1,3 @@
-#! /usr/bin/env ruby
-#
-# Unit testing for the Runit service Provider
-#
-# author Brice Figureau
-#
 require 'spec_helper'
 
 describe 'Puppet::Type::Service::Provider::Runit', unless: Puppet::Util::Platform.jruby? do
@@ -62,7 +56,7 @@ describe 'Puppet::Type::Service::Provider::Runit', unless: Puppet::Util::Platfor
     expect(@provider).to respond_to(:disable)
   end
 
-  describe "when starting" do
+  context "when starting" do
     it "should enable the service if it is not enabled" do
       @provider.stubs(:sv)
 
@@ -80,21 +74,21 @@ describe 'Puppet::Type::Service::Provider::Runit', unless: Puppet::Util::Platfor
     end
   end
 
-  describe "when stopping" do
+  context "when stopping" do
     it "should execute external command 'sv stop /etc/service/myservice'" do
       @provider.expects(:sv).with("stop", "/etc/service/myservice")
       @provider.stop
     end
   end
 
-  describe "when restarting" do
+  context "when restarting" do
     it "should call 'sv restart /etc/service/myservice'" do
       @provider.expects(:sv).with("restart","/etc/service/myservice")
       @provider.restart
     end
   end
 
-  describe "when enabling" do
+  context "when enabling" do
     it "should create a symlink between daemon dir and service dir", :if => Puppet.features.manages_symlinks? do
       daemon_path = File.join(@daemondir,"myservice")
       service_path = File.join(@servicedir,"myservice")
@@ -104,7 +98,7 @@ describe 'Puppet::Type::Service::Provider::Runit', unless: Puppet::Util::Platfor
     end
   end
 
-  describe "when disabling" do
+  context "when disabling" do
     it "should remove the '/etc/service/myservice' symlink" do
       path = File.join(@servicedir,"myservice")
 #      mocked_file = mock(path, :symlink? => true)
@@ -115,14 +109,14 @@ describe 'Puppet::Type::Service::Provider::Runit', unless: Puppet::Util::Platfor
     end
   end
 
-  describe "when checking status" do
+  context "when checking status" do
     it "should call the external command 'sv status /etc/sv/myservice'" do
       @provider.expects(:sv).with('status',File.join(@daemondir,"myservice"))
       @provider.status
     end
   end
 
-  describe "when checking status" do
+  context "when checking status" do
     it "and sv status fails, properly raise a Puppet::Error" do
       @provider.expects(:sv).with('status',File.join(@daemondir,"myservice")).raises(Puppet::ExecutionFailure, "fail: /etc/sv/myservice: file not found")
       expect { @provider.status }.to raise_error(Puppet::Error, 'Could not get status for service Service[myservice]: fail: /etc/sv/myservice: file not found')
@@ -140,5 +134,4 @@ describe 'Puppet::Type::Service::Provider::Runit', unless: Puppet::Util::Platfor
       expect(@provider.status).to eq(:stopped)
     end
   end
-
 end

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

@@ -1,13 +1,7 @@
-#! /usr/bin/env ruby
-#
-# Unit testing for the SMF service Provider
-#
-# author Dominic Cleal
-#
 require 'spec_helper'
 
 describe 'Puppet::Type::Service::Provider::Smf',
-    if: Puppet.features.posix? && !Puppet::Util::Platform.jruby? do
+         if: Puppet.features.posix? && !Puppet::Util::Platform.jruby? do
   let(:provider_class) { Puppet::Type.type(:service).provider(:smf) }
 
   before(:each) do
@@ -25,7 +19,7 @@ describe 'Puppet::Type::Service::Provider::Smf',
     Facter.stubs(:value).with(:operatingsystemrelease).returns '11.2'
   end
 
-  describe ".instances" do
+  context ".instances" do
     it "should have an instances method" do
       expect(provider_class).to respond_to :instances
     end
@@ -70,6 +64,10 @@ describe 'Puppet::Type::Service::Provider::Smf',
   end
 
   describe "when checking status" do
+    before(:each) do
+      @provider.stubs(:complete_service?).returns(true)
+    end
+
     it "should call the external command 'svcs /system/myservice' once" do
       @provider.expects(:svcs).with('-H', '-o', 'state,nstate', "/system/myservice").returns("online\t-")
       @provider.status
@@ -78,6 +76,11 @@ describe 'Puppet::Type::Service::Provider::Smf',
       @provider.stubs(:svcs).raises(Puppet::ExecutionFailure.new("no svc found"))
       expect(@provider.status).to eq(:stopped)
     end
+    it "should return stopped for an incomplete service on Solaris 11" do
+      Facter.stubs(:value).with(:operatingsystemrelease).returns('11.3')
+      @provider.stubs(:complete_service?).returns(false)
+      expect(@provider.status).to eq(:stopped)
+    end
     it "should return running if online in svcs output" do
       @provider.stubs(:svcs).returns("online\t-")
       expect(@provider.status).to eq(:running)
@@ -104,7 +107,7 @@ describe 'Puppet::Type::Service::Provider::Smf',
     end
   end
 
-  describe "when starting" do
+  context "when starting" do
     it "should enable the service if it is not enabled" do
       @provider.expects(:status).returns :stopped
       @provider.expects(:texecute).with(:start, ['/usr/sbin/svcadm', :enable, '-rs', '/system/myservice'], true)
@@ -141,7 +144,7 @@ describe 'Puppet::Type::Service::Provider::Smf',
     end
   end
 
-  describe "when starting a service with a manifest" do
+  context "when starting a service with a manifest" do
     before(:each) do
       @resource = Puppet::Type.type(:service).new(:name => "/system/myservice", :ensure => :running, :enable => :true, :manifest => "/tmp/myservice.xml")
       @provider = provider_class.new(@resource)
@@ -149,6 +152,7 @@ describe 'Puppet::Type::Service::Provider::Smf',
     end
 
     it "should import the manifest if service is missing" do
+      @provider.stubs(:complete_service?).returns(true)
       @provider.expects(:svcs).with('-l', '/system/myservice').raises(Puppet::ExecutionFailure, "Exited 1")
       @provider.expects(:svccfg).with(:import, "/tmp/myservice.xml")
       @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, '-rs', "/system/myservice"], true)
@@ -164,7 +168,7 @@ describe 'Puppet::Type::Service::Provider::Smf',
     end
   end
 
-  describe "when stopping" do
+  context "when stopping" do
     it "should execute external command 'svcadm disable /system/myservice'" do
       @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, '-s', "/system/myservice"], true)
       @provider.expects(:wait).with('offline', 'disabled', 'uninitialized')
@@ -178,8 +182,7 @@ describe 'Puppet::Type::Service::Provider::Smf',
     end
   end
 
-  describe "when restarting" do
-
+  context "when restarting" do
     it "should error if timeout occurs while restarting the service" do
       @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, '-s', "/system/myservice"], true)
       Timeout.expects(:timeout).with(60).raises(Timeout::Error)
@@ -212,6 +215,67 @@ describe 'Puppet::Type::Service::Provider::Smf',
         @provider.restart
       end
     end
+  end
+
+  describe '#service_fmri' do
+    it 'raises a Puppet::Error if the service resource matches multiple FMRIs' do
+      @provider.stubs(:svcs).with('-l', @provider.resource[:name]).returns(File.read(my_fixture('svcs_multiple_fmris.out')))
+
+      expect { @provider.service_fmri }.to raise_error do |error|
+        expect(error).to be_a(Puppet::Error)
+        expect(error.message).to match(@provider.resource[:name])
+        expect(error.message).to match('multiple')
+
+        matched_fmris = ["svc:/application/tstapp:one", "svc:/application/tstapp:two"]
+        expect(error.message).to match(matched_fmris.join(', '))
+      end
+    end
+
+    it 'raises a Puppet:ExecutionFailure if svcs fails' do
+      @provider.stubs(:svcs).with('-l', @provider.resource[:name]).raises(
+        Puppet::ExecutionFailure, 'svcs failed!'
+      )
+
+      expect { @provider.service_fmri }.to raise_error do |error|
+        expect(error).to be_a(Puppet::ExecutionFailure)
+        expect(error.message).to match('svcs failed!')
+      end
+    end
 
+    it "returns the service resource's fmri and memoizes it" do
+      @provider.stubs(:svcs).with('-l', @provider.resource[:name]).returns(File.read(my_fixture('svcs_fmri.out')))
+
+      expected_fmri = 'svc:/application/tstapp:default'
+
+      expect(@provider.service_fmri).to eql(expected_fmri)
+      expect(@provider.instance_variable_get(:@fmri)).to eql(expected_fmri)
+    end
+  end
+
+  describe '#complete_service?' do
+    let(:fmri) { 'service_fmri' }
+
+    before(:each) do
+      @provider.stubs(:service_fmri).returns(fmri)
+    end
+
+    it 'should raise a Puppet::Error if it is called on an older Solaris machine' do
+      Facter.stubs(:value).with(:operatingsystemrelease).returns('10.0')
+
+      expect { @provider.complete_service? }.to raise_error(Puppet::Error)
+    end
+
+    it 'should return false for an incomplete service' do
+      @provider.stubs(:svccfg).with('-s', fmri, 'listprop', 'general/complete').returns("")
+      expect(@provider.complete_service?).to be false
+    end
+
+    it 'should return true for a complete service' do
+      @provider.stubs(:svccfg)
+        .with('-s', fmri, 'listprop', 'general/complete')
+        .returns("general/complete astring")
+
+      expect(@provider.complete_service?).to be true
+    end
   end
 end