puppet 2.6.18 → 2.7.1

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

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 # Unit testing for the debian service provider
 #
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:debian)
 

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

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

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

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 # Unit testing for the Init service Provider
 #
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:init)
 
@@ -46,7 +46,7 @@ describe provider_class do
       results = (@services-exclude).collect {|x| "#{x}_instance"}
       @class.get_services(@class.defpath, exclude).should == results
     end
-    it "should omit a single service from the exclude list" do
+    it "should omit a single service from the exclude list", :'fails_on_ruby_1.9.2' => true do
       exclude = 'two'
       (@services-exclude.to_a).each do |inst|
         @class.expects(:new).with{|hash| hash[:name] == inst}.returns("#{inst}_instance")

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

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 # Unit testing for the launchd service provider
 #
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 require 'puppet'
 

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

@@ -1,8 +1,8 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 # Unit testing for the RedHat service Provider
 #
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:redhat)
 

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

@@ -1,10 +1,10 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 # Unit testing for the Runit service Provider
 #
 # author Brice Figureau
 #
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:runit)
 

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

@@ -0,0 +1,137 @@
+#!/usr/bin/env rspec
+#
+# Unit testing for the SMF service Provider
+#
+# author Dominic Cleal
+#
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:service).provider(:smf)
+
+describe provider_class do
+
+  before(:each) do
+    # Create a mock resource
+    @resource = Puppet::Type.type(:service).new(
+      :name => "/system/myservice", :ensure => :running, :enable => :true)
+    @provider = provider_class.new(@resource)
+
+    FileTest.stubs(:file?).with('/usr/sbin/svcadm').returns true
+    FileTest.stubs(:executable?).with('/usr/sbin/svcadm').returns true
+    FileTest.stubs(:file?).with('/usr/bin/svcs').returns true
+    FileTest.stubs(:executable?).with('/usr/bin/svcs').returns true
+  end
+
+  it "should have a restart method" do
+    @provider.should respond_to(:restart)
+  end
+
+  it "should have a restartcmd method" do
+    @provider.should respond_to(:restartcmd)
+  end
+
+  it "should have a start method" do
+    @provider.should respond_to(:start)
+  end
+
+  it "should have a stop method" do
+    @provider.should respond_to(:stop)
+  end
+
+  it "should have an enabled? method" do
+    @provider.should respond_to(:enabled?)
+  end
+
+  it "should have an enable method" do
+    @provider.should respond_to(:enable)
+  end
+
+  it "should have a disable method" do
+    @provider.should respond_to(:disable)
+  end
+
+  describe "when checking status" do
+    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
+    end
+    it "should return stopped if svcs can't find the service" do
+      @provider.stubs(:svcs).raises(Puppet::ExecutionFailure.new("no svc found"))
+      @provider.status.should == :stopped
+    end
+    it "should return running if online in svcs output" do
+      @provider.stubs(:svcs).returns("online\t-")
+      @provider.status.should == :running
+    end
+    it "should return stopped if disabled in svcs output" do
+      @provider.stubs(:svcs).returns("disabled\t-")
+      @provider.status.should == :stopped
+    end
+    it "should return maintenance if in maintenance in svcs output" do
+      @provider.stubs(:svcs).returns("maintenance\t-")
+      @provider.status.should == :maintenance
+    end
+    it "should return target state if transitioning in svcs output" do
+      @provider.stubs(:svcs).returns("online\tdisabled")
+      @provider.status.should == :stopped
+    end
+    it "should throw error if it's a legacy service in svcs output" do
+      @provider.stubs(:svcs).returns("legacy_run\t-")
+      lambda { @provider.status }.should raise_error(Puppet::Error, "Cannot manage legacy services through SMF")
+    end
+  end
+
+  describe "when starting" do
+    it "should enable the service if it is not enabled" do
+      @provider.expects(:status).returns :stopped
+      @provider.expects(:texecute)
+      @provider.start
+    end
+
+    it "should always execute external command 'svcadm enable /system/myservice'" do
+      @provider.stubs(:status).returns :running
+      @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, "/system/myservice"], true)
+      @provider.start
+    end
+
+    it "should execute external command 'svcadm clear /system/myservice' if in maintenance" do
+      @provider.stubs(:status).returns :maintenance
+      @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :clear, "/system/myservice"], true)
+      @provider.start
+    end
+  end
+
+  describe "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)
+      $CHILD_STATUS.stubs(:exitstatus).returns(1)
+    end
+
+    it "should import the manifest if service is missing" do
+      @provider.expects(:svccfg).with(:import, "/tmp/myservice.xml")
+      @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, "/system/myservice"], true)
+      @provider.start
+    end
+
+    it "should handle failures if importing a manifest" do
+      @provider.expects(:svccfg).raises(Puppet::ExecutionFailure.new("can't svccfg import"))
+      lambda { @provider.start }.should raise_error(Puppet::Error, "Cannot config /system/myservice to enable it: can't svccfg import")
+    end
+  end
+
+  describe "when stopping" do
+    it "should execute external command 'svcadm disable /system/myservice'" do
+      @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, "/system/myservice"], true)
+      @provider.stop
+    end
+  end
+
+  describe "when restarting" do
+    it "should call 'svcadm restart /system/myservice'" do
+      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "/system/myservice"], true)
+      @provider.restart
+    end
+  end
+
+end

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

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 # Unit testing for the AIX System Resource Controller (src) provider
 #
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:src)
 
@@ -44,7 +44,7 @@ describe provider_class do
     @provider.stop
   end
 
-  it "should execute status and return running if the subsystem is active" do
+  it "should execute status and return running if the subsystem is active", :'fails_on_ruby_1.9.2' => true 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" do
+  it "should execute status and return stopped if the subsystem is inoperative", :'fails_on_ruby_1.9.2' => true 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" do
+  it "should execute status and return nil if the status is not known", :'fails_on_ruby_1.9.2' => true 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" do
+  it "should execute restart which runs refresh", :'fails_on_ruby_1.9.2' => true 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" do
+  it "should execute restart which runs stopsrc then startsrc", :'fails_on_ruby_1.9.2' => true 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/upstart.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:service).provider(:upstart)
+
+describe provider_class do
+  describe "#instances" do
+    it "should be able to find all instances" do
+      processes = ["rc stop/waiting", "ssh start/running, process 712"]
+      provider_class.stubs(:execpipe).yields(processes)
+      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)
+      provider_class.instances.first.name.should == "network-interface INTERFACE=eth0"
+    end
+  end
+
+  describe "#status" do
+    it "should allow the user to override the status command" do
+      resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart, :status => "/bin/foo")
+      provider = provider_class.new(resource)
+
+      provider.expects(:ucommand).with { `true`; true }
+      provider.status.should == :running
+    end
+
+    it "should use the default status command if none is specified" do
+      resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart)
+      provider = provider_class.new(resource)
+
+      provider.expects(:status_exec).with(["foo"]).returns("foo start/running, process 1000")
+      Process::Status.any_instance.stubs(:exitstatus).returns(0)
+      provider.status.should == :running
+    end
+
+    it "should properly handle services with 'start' in their name" do
+      resource = Puppet::Type.type(:service).new(:name => "foostartbar", :provider => :upstart)
+      provider = provider_class.new(resource)
+
+      provider.expects(:status_exec).with(["foostartbar"]).returns("foostartbar stop/waiting")
+      Process::Status.any_instance.stubs(:exitstatus).returns(0)
+      provider.status.should == :stopped
+    end
+  end
+end

data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb

@@ -1,19 +1,12 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'shared_behaviours/all_parsedfile_providers'
 require 'puppet_spec/files'
-require 'puppettest/support/utils'
-require 'puppettest/fileparsing'
-require 'puppettest/fakes'
 
 provider_class = Puppet::Type.type(:ssh_authorized_key).provider(:parsed)
 
 describe provider_class do
   include PuppetSpec::Files
-  extend PuppetTest::Support::Utils
-  include PuppetTest
-  include PuppetTest::FileParsing
 
   before :each do
     @sshauthkey_class = Puppet::Type.type(:ssh_authorized_key)
@@ -29,15 +22,13 @@ describe provider_class do
   end
 
   def mkkey(args)
-    fakeresource = fakeresource(:ssh_authorized_key, args[:name])
-    fakeresource.stubs(:should).with(:user).returns @user
-    fakeresource.stubs(:should).with(:target).returns @keyfile
-
-    key = @provider.new(fakeresource)
+    args[:target] = @keyfile
+    args[:user]   = @user
+    resource = Puppet::Type.type(:ssh_authorized_key).new(args)
+    key = @provider.new(resource)
     args.each do |p,v|
       key.send(p.to_s + "=", v)
     end
-
     key
   end
 
@@ -50,38 +41,28 @@ describe provider_class do
     @provider.target_object(@keyfile).read
   end
 
-  fakedata("data/providers/ssh_authorized_key/parsed").each { |file|
-    it "should be able to parse example data in #{file}" do
-      fakedataparse(file)
-    end
-  }
+  it_should_behave_like "all parsedfile providers", provider_class
 
   it "should be able to generate a basic authorized_keys file" do
 
-    key = mkkey(
-      {
-        :name => "Just Testing",
-        :key => "AAAAfsfddsjldjgksdflgkjsfdlgkj",
-        :type => "ssh-dss",
-        :ensure => :present,
-
-        :options => [:absent]
-    })
+    key = mkkey(:name    => "Just Testing",
+                :key     => "AAAAfsfddsjldjgksdflgkjsfdlgkj",
+                :type    => "ssh-dss",
+                :ensure  => :present,
+                :options => [:absent]
+              )
 
     genkey(key).should == "ssh-dss AAAAfsfddsjldjgksdflgkjsfdlgkj Just Testing\n"
   end
 
   it "should be able to generate a authorized_keys file with options" do
 
-    key = mkkey(
-      {
-        :name => "root@localhost",
-        :key => "AAAAfsfddsjldjgksdflgkjsfdlgkj",
-        :type => "ssh-rsa",
-        :ensure => :present,
-
-        :options => ['from="192.168.1.1"', "no-pty", "no-X11-forwarding"]
-    })
+    key = mkkey(:name    => "root@localhost",
+                :key     => "AAAAfsfddsjldjgksdflgkjsfdlgkj",
+                :type    => "ssh-rsa",
+                :ensure  => :present,
+                :options => ['from="192.168.1.1"', "no-pty", "no-X11-forwarding"]
+                )
 
     genkey(key).should == "from=\"192.168.1.1\",no-pty,no-X11-forwarding ssh-rsa AAAAfsfddsjldjgksdflgkjsfdlgkj root@localhost\n"
   end
@@ -133,15 +114,15 @@ describe provider_class do
         @provider.flush
       end
 
-      it "should absolutely not chown the directory to the user" do
+      it "should chown the directory to the user" do
         uid = Puppet::Util.uid("random_bob")
-        File.expects(:chown).never
+        File.expects(:chown).with(uid, nil, "/tmp/.ssh_dir")
         @provider.flush
       end
 
-      it "should absolutely not chown the key file to the user" do
+      it "should chown the key file to the user" do
         uid = Puppet::Util.uid("random_bob")
-        File.expects(:chown).never
+        File.expects(:chown).with(uid, nil, "/tmp/.ssh_dir/place_to_put_authorized_keys")
         @provider.flush
       end
 
@@ -177,11 +158,11 @@ describe provider_class do
         @provider.flush
       end
 
-      it "should absolutely not chown the directory to the user if it creates it" do
+      it "should chown the directory to the user if it creates it" do
         File.stubs(:exist?).with(@dir).returns false
         Dir.stubs(:mkdir).with(@dir,0700)
         uid = Puppet::Util.uid("nobody")
-        File.expects(:chown).never
+        File.expects(:chown).with(uid, nil, @dir)
         @provider.flush
       end
 
@@ -192,9 +173,9 @@ describe provider_class do
         @provider.flush
       end
 
-      it "should absolutely not chown the key file to the user" do
+      it "should chown the key file to the user" do
         uid = Puppet::Util.uid("nobody")
-        File.expects(:chown).never
+        File.expects(:chown).with(uid, nil, File.expand_path("~nobody/.ssh/authorized_keys"))
         @provider.flush
       end