puppet 2.7.26 → 3.0.0.rc4

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider = Puppet::Type.type(:package).provider(:yum)

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:zypper)

data/spec/unit/provider/parsedfile_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/provider/parsedfile'

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'win32/taskscheduler' if Puppet.features.microsoft_windows?
@@ -565,32 +565,29 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
     end
   end
 
-  describe '#user_insync?', :if => Puppet.features.microsoft_windows? do
+  describe '#user_insync?' do
     let(:resource) { described_class.new(:name => 'foobar', :command => 'C:\Windows\System32\notepad.exe') }
 
-    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')
+    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
       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
@@ -1459,7 +1456,7 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
       end
     end
 
-    describe '#user=', :if => Puppet.features.microsoft_windows? do
+    describe '#user=' do
       before :each do
         @mock_task = mock
         @mock_task.responds_like(Win32::TaskScheduler.new)
@@ -1469,7 +1466,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::Windows::Security.stubs(:name_to_sid).with('system').returns('SYSTEM SID')
+        Puppet::Util::ADSI.stubs(:sid_for_account).with('system').returns('SYSTEM SID')
 
         resource = Puppet::Type.type(:scheduled_task).new(
           :name    => 'Test Task',
@@ -1483,7 +1480,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::Windows::Security.stubs(:name_to_sid).with('my_user_name').returns('SID A')
+        Puppet::Util::ADSI.stubs(:sid_for_account).with('my_user_name').returns('SID A')
 
         resource = Puppet::Type.type(:scheduled_task).new(
           :name     => 'Test Task',

data/spec/unit/provider/selboolean_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:selboolean).provider(:getsetsebool)

data/spec/unit/provider/selmodule_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 
 # Note: This unit test depends on having a sample SELinux policy file
 # in the same directory as this test called selmodule-example.pp

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

@@ -0,0 +1,77 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+require 'rbconfig'
+require 'fileutils'
+
+provider_class = Puppet::Type.type(:service).provider(:init)
+
+describe "base service provider" do
+  include PuppetSpec::Files
+
+  let :type do Puppet::Type.type(:service) end
+  let :provider do type.provider(:base) end
+
+  subject { provider }
+
+  context "basic operations" do
+    # Cross-platform file interactions.  Fun times.
+    Ruby = File.join(RbConfig::CONFIG["bindir"],
+                     RbConfig::CONFIG["RUBY_INSTALL_NAME"] +
+                     RbConfig::CONFIG["EXEEXT"])
+
+    Start  = [Ruby, '-rfileutils', '-e', 'FileUtils.touch(ARGV[0])']
+    Status = [Ruby, '-e' 'exit File.file?(ARGV[0])']
+    Stop   = [Ruby, '-e', 'File.exist?(ARGV[0]) and File.unlink(ARGV[0])']
+
+    let :flag do tmpfile('base-service-test') end
+
+    subject do
+      type.new(:name  => "test", :provider => :base,
+               :start  => Start  + [flag],
+               :status => Status + [flag],
+               :stop   => Stop   + [flag]
+      ).provider
+    end
+
+    before :each do
+      File.unlink(flag) if File.exist?(flag)
+    end
+
+    it { should be }
+
+    it "should invoke the start command if not running" do
+      File.should_not be_file flag
+      subject.start
+      File.should be_file flag
+    end
+
+    it "should be stopped before being started" do
+      subject.status.should == :stopped
+    end
+
+    it "should be running after being started" do
+      subject.start
+      subject.status.should == :running
+    end
+
+    it "should invoke the stop command when asked" do
+      subject.start
+      subject.status.should == :running
+      subject.stop
+      subject.status.should == :stopped
+      File.should_not be_file flag
+    end
+
+    it "should start again even if already running" do
+      subject.start
+      subject.expects(:ucommand).with(:start)
+      subject.start
+    end
+
+    it "should stop again even if already stopped" do
+      subject.stop
+      subject.expects(:ucommand).with(:stop)
+      subject.stop
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the Daemontools service Provider
 #

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the debian service provider
 #

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:freebsd)

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 
 require 'spec_helper'
 

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the Init service Provider
 #

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

@@ -202,21 +202,4 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       subject.enable
     end
   end
-
-  describe "when using an incompatible version of Facter" do
-    before :each do
-      provider.instance_variable_set(:@macosx_version_major, nil)
-    end
-    it "should display a deprecation warning" do
-      resource[:enable] = true
-      Facter.expects(:value).with(:macosx_productversion_major).returns(nil)
-      Facter.expects(:value).with(:macosx_productversion).returns('10.5.8')
-      Facter.expects(:loadfacts)
-      Puppet::Util::Warnings.expects(:maybe_log)
-      subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
-      subject.expects(:enabled?).returns :false
-      File.expects(:open).returns('')
-      subject.enable
-    end
-  end
 end

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the RedHat service Provider
 #
@@ -21,6 +21,15 @@ describe provider_class, :as_platform => :posix do
     FileTest.stubs(:executable?).with('/sbin/service').returns true
   end
 
+  osfamily = [ 'redhat', 'suse' ]
+
+  osfamily.each do |osfamily|
+    it "should be the default provider on #{osfamily}" do
+      Facter.expects(:value).with(:osfamily).returns(osfamily)
+      provider_class.default?.should be_true
+    end
+  end
+
   # test self.instances
   describe "when getting all service instances" do
     before :each do
@@ -45,8 +54,8 @@ 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)
+  it "(#15797) should use 'reset' instead of 'on' when calling enable" do
+    provider_class.expects(:chkconfig).with(@resource[:name], :reset)
     @provider.enable
   end
 

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the Runit service Provider
 #
@@ -69,6 +69,7 @@ describe provider_class do
 
       @provider.expects(:enabled?).returns :false
       @provider.expects(:enable)
+      @provider.stubs(:sleep)
 
       @provider.start
     end

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the SMF service Provider
 #
@@ -22,6 +22,21 @@ describe provider_class, :as_platform => :posix do
     FileTest.stubs(:executable?).with('/usr/bin/svcs').returns true
   end
 
+  describe ".instances" do
+    it "should have an instances method" do
+      provider_class.should respond_to :instances
+    end
+
+    it "should get a list of services (excluding legacy)" do
+      provider_class.expects(:svcs).with().returns File.read(my_fixture('svcs.out'))
+      instances = provider_class.instances.map { |p| {:name => p.get(:name), :ensure => p.get(:ensure)} }
+      # we dont manage legacy
+      instances.size.should == 2
+      instances[0].should == {:name => 'svc:/system/svc/restarter:default', :ensure => :running }
+      instances[1].should == {:name => 'svc:/network/cswrsyncd:default', :ensure => :maintenance }
+    end
+  end
+
   it "should have a restart method" do
     @provider.should respond_to(:restart)
   end

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the AIX System Resource Controller (src) provider
 #
@@ -44,7 +44,7 @@ describe provider_class do
     @provider.stop
   end
 
-  it "should execute status and return running if the subsystem is active", :'fails_on_ruby_1.9.2' => true do
+  it "should execute status and return running if the subsystem is active" do
     sample_output = <<_EOF_
 Subsystem         Group            PID          Status
 myservice         tcpip            1234         active
@@ -54,7 +54,7 @@ _EOF_
     @provider.status.should == :running
   end
 
-  it "should execute status and return stopped if the subsystem is inoperative", :'fails_on_ruby_1.9.2' => true do
+  it "should execute status and return stopped if the subsystem is inoperative" do
     sample_output = <<_EOF_
 Subsystem         Group            PID          Status
 myservice         tcpip                         inoperative
@@ -64,7 +64,7 @@ _EOF_
     @provider.status.should == :stopped
   end
 
-  it "should execute status and return nil if the status is not known", :'fails_on_ruby_1.9.2' => true do
+  it "should execute status and return nil if the status is not known" do
     sample_output = <<_EOF_
 Subsystem         Group            PID          Status
 myservice         tcpip                         randomdata
@@ -74,7 +74,7 @@ _EOF_
     @provider.status.should == nil
   end
 
-  it "should execute restart which runs refresh", :'fails_on_ruby_1.9.2' => true do
+  it "should execute restart which runs refresh" do
     sample_output = <<_EOF_
 #subsysname:synonym:cmdargs:path:uid:auditid:standin:standout:standerr:action:multi:contact:svrkey:svrmtype:priority:signorm:sigforce:display:waittime:grpname:
 myservice:::/usr/sbin/inetd:0:0:/dev/console:/dev/console:/dev/console:-O:-Q:-K:0:0:20:0:0:-d:20:tcpip:
@@ -84,7 +84,7 @@ _EOF_
     @provider.restart
   end
 
-  it "should execute restart which runs stopsrc then startsrc", :'fails_on_ruby_1.9.2' => true do
+  it "should execute restart which runs stopsrc then startsrc" do
     sample_output =  <<_EOF_
 #subsysname:synonym:cmdargs:path:uid:auditid:standin:standout:standerr:action:multi:contact:svrkey:svrmtype:priority:signorm:sigforce:display:waittime:grpname:
 myservice::--no-daemonize:/usr/sbin/puppetd:0:0:/dev/null:/var/log/puppet.log:/var/log/puppet.log:-O:-Q:-S:0:0:20:15:9:-d:20::"

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the RedHat service Provider
 #
@@ -17,9 +17,26 @@ describe provider_class do
     @provider.resource = @resource
   end
 
+  osfamily = [ 'redhat', 'suse' ]
+
+  osfamily.each do |osfamily|
+    it "should be the default provider on #{osfamily}" do
+      pending "This test is pending the change in RedHat-related Linuxes to systemd for service management"
+    end
+  end
+
   [:enabled?, :enable, :disable, :start, :stop, :status, :restart].each do |method|
     it "should have a #{method} method" do
       @provider.should respond_to(method)
     end
   end
+
+
+  it 'should return resources from self.instances' do
+    provider_class.expects(:systemctl).with('list-units', '--full', '--all',  '--no-pager').returns(
+      "my_service loaded active running\nmy_other_service loaded active running"
+    )
+    provider_class.instances.map {|provider| provider.name}.should =~ ["my_service","my_other_service"]
+  end
+
 end

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

@@ -1,11 +1,11 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:service).provider(:upstart)
 
-describe provider_class, :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Type.type(:service).provider(:upstart) do
   let(:manual) { "\nmanual" }
   let(:start_on_default_runlevels) {  "\nstart on runlevel [2,3,4,5]" }
+  let(:provider_class) { Puppet::Type.type(:service).provider(:upstart) }
 
   def given_contents_of(file, content)
     File.open(file, 'w') do |file|
@@ -17,16 +17,21 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     File.open(file).read
   end
 
+  def lists_processes_as(output)
+    Puppet::Util::Execution.stubs(:execpipe).with("/sbin/initctl list").yields(output)
+    provider_class.stubs(:which).with("/sbin/initctl").returns("/sbin/initctl")
+  end
+
   describe "#instances" do
     it "should be able to find all instances" do
-      processes = ["rc stop/waiting", "ssh start/running, process 712"].join("\n")
-      provider_class.stubs(:execpipe).yields(processes)
+      lists_processes_as("rc stop/waiting\nssh start/running, process 712")
+
       provider_class.instances.map {|provider| provider.name}.should =~ ["rc","ssh"]
     end
 
     it "should attach the interface name for network interfaces" do
-      processes = "network-interface (eth0)"
-      provider_class.stubs(:execpipe).yields(processes)
+      lists_processes_as("network-interface (eth0)")
+
       provider_class.instances.first.name.should == "network-interface INTERFACE=eth0"
     end
 

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 #
 # Unit testing for the Windows service Provider
 #