puppet 0.24.9 → 0.25.0

data/spec/unit/provider/macauthorization.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# 
+#
 # Unit testing for the macauthorization provider
 #
 
@@ -11,20 +11,20 @@ require 'facter/util/plist'
 provider_class = Puppet::Type.type(:macauthorization).provider(:macauthorization)
 
 describe provider_class do
-    
+
     before :each do
         # Create a mock resource
         @resource = stub 'resource'
-        
+
         @authname = "foo.spam.eggs.puppettest"
         @authplist = {}
-        
+
         @rules = {@authname => @authplist}
-        
+
         authdb = {}
         authdb["rules"] = { "foorule" => "foo" }
         authdb["rights"] = { "fooright" => "foo" }
-        
+
         # Stub out Plist::parse_xml
         Plist.stubs(:parse_xml).returns(authdb)
 
@@ -38,42 +38,42 @@ describe provider_class do
 
         @provider = provider_class.new(@resource)
     end
-    
+
     it "should have a create method" do
         @provider.should respond_to(:create)
     end
-    
+
     it "should have a destroy method" do
         @provider.should respond_to(:destroy)
     end
-    
+
     it "should have an exists? method" do
         @provider.should respond_to(:exists?)
     end
-    
+
     it "should have a flush method" do
         @provider.should respond_to(:flush)
     end
-    
+
     properties = [  :allow_root, :authenticate_user, :auth_class, :comment,
                         :group, :k_of_n, :mechanisms, :rule, :session_owner,
                         :shared, :timeout, :tries, :auth_type ]
-                        
+
     properties.each do |prop|
         it "should have a #{prop.to_s} method" do
             @provider.should respond_to(prop.to_s)
         end
-        
+
         it "should have a #{prop.to_s}= method" do
             @provider.should respond_to(prop.to_s + "=")
         end
     end
-    
+
     describe "when destroying a right" do
         before :each do
             @resource.stubs(:[]).with(:auth_type).returns(:right)
         end
-        
+
         it "should call the internal method destroy_right" do
             @provider.expects(:destroy_right)
             @provider.destroy
@@ -83,41 +83,41 @@ describe provider_class do
             @provider.destroy
         end
     end
-    
+
     describe "when destroying a rule" do
         before :each do
             @resource.stubs(:[]).with(:auth_type).returns(:rule)
         end
-        
+
         it "should call the internal method destroy_rule" do
             @provider.expects(:destroy_rule)
             @provider.destroy
         end
     end
-    
+
     describe "when flushing a right" do
         before :each do
             @resource.stubs(:[]).with(:auth_type).returns(:right)
         end
-        
+
         it "should call the internal method flush_right" do
             @provider.expects(:flush_right)
             @provider.flush
         end
-        
+
         it "should call the internal method set_right" do
             @provider.expects(:set_right)
             @provider.flush
         end
-        
+
         it "should read and write to the auth database with the right arguments" do
-            @provider.expects(:execute).with() { |cmds, args| 
+            @provider.expects(:execute).with() { |cmds, args|
                 cmds.include?("read") and
                 cmds.include?(@authname) and
                 args[:combine] == false
             }.once
-            
-            @provider.expects(:execute).with() { |cmds, args| 
+
+            @provider.expects(:execute).with() { |cmds, args|
                 cmds.include?("write") and
                 cmds.include?(@authname) and
                 args[:combine] == false and
@@ -125,23 +125,23 @@ describe provider_class do
             }.once
             @provider.flush
         end
-        
+
     end
-    
+
     describe "when flushing a rule" do
         before :each do
             @resource.stubs(:[]).with(:auth_type).returns(:rule)
         end
-        
+
         it "should call the internal method flush_rule" do
             @provider.expects(:flush_rule)
             @provider.flush
         end
-        
+
         it "should call the internal method set_rule" do
             @provider.expects(:set_rule)
             @provider.flush
         end
     end
 
-end
+end

data/spec/unit/provider/mcx/mcxcontent.rb

@@ -3,8 +3,8 @@
 # Copyright (C) 2008 Jeffrey J McCune.
 
 # This program and entire repository is free software; you can
-# redistribute it and/or modify it under the terms of the GNU 
-# General Public License as published by the Free Software 
+# redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -74,11 +74,11 @@ describe provider_class do
         it "should execute external command dscl from :create" do
             @provider.class.expects(:dscl).returns('').once
             @provider.create
-        end 
+        end
         it "should execute external command dscl from :destroy" do
             @provider.class.expects(:dscl).with('localhost', '-mcxdelete', @ds_path).returns('').once
             @provider.destroy
-        end 
+        end
         it "should execute external command dscl from :exists?" do
             @provider.class.expects(:dscl).with('localhost', '-mcxexport', @ds_path).returns('').once
             @provider.exists?

data/spec/unit/provider/mount/parsed.rb

@@ -75,7 +75,7 @@ provider_class = Puppet::Type.type(:mount).provider(:parsed)
 
 describe provider_class do
     before :each do
-        @mount_class = Puppet.type(:mount)
+        @mount_class = Puppet::Type.type(:mount)
         @provider_class = @mount_class.provider(:parsed)
     end
 
@@ -102,7 +102,7 @@ describe provider_class do
         # LAK:FIXME I can't mock Facter because this test happens at parse-time.
         it "should default to /etc/vfstab on Solaris and /etc/fstab everywhere else" do
             should = case Facter.value(:operatingsystem)
-                when "Solaris": "/etc/vfstab"
+                when "Solaris"; "/etc/vfstab"
                 else
                     "/etc/fstab"
                 end
@@ -132,7 +132,8 @@ describe provider_class do
         before do
             Puppet.settings.stubs(:use)
             # Never write to disk, only to RAM.
-            @provider_class.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
+            #@provider_class.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
+            @provider_class.stubs(:target_object).returns(Puppet::Util::FileType.filetype(:ram).new("eh"))
 
             @mount = mkmount
             @target = @provider_class.default_target
@@ -151,7 +152,7 @@ describe provider_class do
         include ParsedMountTesting
 
         before do
-            @mount = @mount_class.create :name => "/"
+            @mount = @mount_class.new :name => "/"
             @provider = @mount.provider
         end
 
@@ -168,10 +169,6 @@ describe provider_class do
             @provider_class.prefetch("/" => @mount)
             @mount.provider.should be_mounted
         end
-
-        after do
-            Puppet::Type.allclear
-        end
     end
 
     describe provider_class, " when mounting and unmounting" do

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

@@ -98,40 +98,40 @@ Version table:
         it "should use 'apt-get install' with the package name if no version is asked for" do
             @resource.expects(:[]).with(:ensure).returns :installed
             @provider.expects(:aptget).with { |*command| command[-1] == "asdf" and command[-2] == :install }
-            
+
             @provider.install
         end
 
         it "should specify the package version if one is asked for" do
             @resource.expects(:[]).with(:ensure).returns "1.0"
             @provider.expects(:aptget).with { |*command| command[-1] == "asdf=1.0" }
-            
+
             @provider.install
         end
 
         it "should do a quiet install" do
             @provider.expects(:aptget).with { |*command| command.include?("-q") }
-            
+
             @provider.install
         end
 
         it "should default to 'yes' for all questions" do
             @provider.expects(:aptget).with { |*command| command.include?("-y") }
-            
+
             @provider.install
         end
 
         it "should keep config files if asked" do
             @resource.expects(:[]).with(:configfiles).returns :keep
             @provider.expects(:aptget).with { |*command| command.include?("DPkg::Options::=--force-confold") }
-            
+
             @provider.install
         end
 
         it "should replace config files if asked" do
             @resource.expects(:[]).with(:configfiles).returns :replace
             @provider.expects(:aptget).with { |*command| command.include?("DPkg::Options::=--force-confnew") }
-            
+
             @provider.install
         end
     end

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

@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+
+provider = Puppet::Type.type(:package).provider(:pkgdmg)
+
+describe provider do
+    before do
+        @resource = stub 'resource', :[] => "dummypkgdmg"
+        @provider = provider.new(@resource)
+
+        @fakemountpoint = "/tmp/dmg.foo"
+        @fakehdiutilinfo = {"system-entities" => [{"mount-point" => @fakemountpoint}] }
+        @fakehdiutilplist = Plist::Emit.dump(@fakehdiutilinfo)
+
+        @hdiutilmountargs = ["mount", "-plist", "-nobrowse", "-readonly",
+                             "-noidme", "-mountrandom", "/tmp"]
+    end
+
+    it "should not be versionable" do
+        provider.versionable?.should be_false
+    end
+
+    it "should not be uninstallable" do
+        provider.uninstallable?.should be_false
+    end
+
+    describe "when installing it should fail when" do
+        it "no source is specified" do
+            @resource.stubs(:[]).with(:source).returns nil
+            lambda { @provider.install }.should raise_error(Puppet::Error)
+        end
+
+        it "no name is specified" do
+            @resource.stubs(:[]).with(:name).returns nil
+            lambda { @provider.install }.should raise_error(Puppet::Error)
+        end
+
+        it "the source does not end in .dmg" do
+            @resource.stubs(:[]).with(:source).returns "notendingindotdmg"
+            lambda { @provider.install }.should raise_error(Puppet::Error)
+        end
+
+        it "a disk image with no system entities is mounted" do
+            @provider.stubs(:[]).with(:hdiutil).returns ""
+            lambda { @provider.install }.should raise_error(Puppet::Error)
+        end
+    end
+
+    # These tests shouldn't be this messy. The pkgdmg provider needs work...
+    describe "when installing" do
+        before do
+            fh = mock 'filehandle'
+            fh.stubs(:path).yields "/tmp/foo"
+            @resource.stubs(:[]).with(:source).returns "foo.dmg"
+            File.stubs(:open).yields fh
+        end
+
+        it "should call hdiutil to mount and eject the disk image" do
+            Dir.stubs(:entries).returns []
+            @provider.class.expects(:hdiutil).with("eject", @fakemountpoint).returns 0
+            @provider.class.expects(:hdiutil).with("mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", nil).returns @fakehdiutilplist
+            @provider.install
+        end
+
+        it "should call installpkg if a pkg/mpkg is found on the dmg" do
+            Dir.stubs(:entries).returns ["foo.pkg"]
+            @provider.class.stubs(:hdiutil).returns @fakehdiutilplist
+            @provider.class.expects(:installpkg).with("#{@fakemountpoint}/foo.pkg", @resource[:name], "foo.dmg").returns ""
+            @provider.install
+        end
+    end
+end

data/spec/unit/provider/selboolean.rb

@@ -26,7 +26,7 @@ describe provider_class do
         @provider.expects(:execpipe).with("/usr/sbin/setsebool  foo off")
         @provider.value = :off
     end
-     
+
     it "should call execpipe with -P when updating persistent boolean setting" do
         @resource.stubs(:[]).with(:persistent).returns :true
         @provider.expects(:command).with(:setsebool).returns "/usr/sbin/setsebool"

data/spec/unit/provider/selmodule.rb

@@ -16,7 +16,7 @@ describe provider_class do
         @provider = provider_class.new(@resource)
     end
 
-    describe "exists? method" do 
+    describe "exists? method" do
         it "should find a module if it is already loaded" do
             @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
             @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields ["bar\t1.2.3\n", "foo\t4.4.4\n", "bang\t1.0.0\n"]
@@ -45,7 +45,7 @@ describe provider_class do
 
     describe "syncversion" do
         it "should return :true if loaded and file modules are in sync" do
-            @provider.expects(:selmodversion_loaded).returns "1.5.0" 
+            @provider.expects(:selmodversion_loaded).returns "1.5.0"
             @provider.expects(:selmodversion_file).returns "1.5.0"
             @provider.syncversion.should == :true
         end

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

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# 
+#
 # Unit testing for the Daemontools service Provider
 #
 # author Brice Figureau
@@ -30,11 +30,17 @@ describe provider_class do
         @resource.stubs(:[]).with(:path).returns @daemondir
         @resource.stubs(:ref).returns "Service[myservice]"
 
-        @provider.stubs(:resource).returns @resource
+        @provider.resource = @resource
+
+        @provider.stubs(:command).with(:svc).returns "svc"
+        @provider.stubs(:command).with(:svstat).returns "svstat"
+
+        @provider.stubs(:svc)
+        @provider.stubs(:svstat)
     end
-    
-    it "should have a restartcmd method" do
-        @provider.should respond_to(:restartcmd)
+
+    it "should have a restart method" do
+        @provider.should respond_to(:restart)
     end
 
     it "should have a start method" do
@@ -58,19 +64,40 @@ describe provider_class do
     end
 
     describe "when starting" do
-        it "should call enable" do
+        it "should use 'svc' to start the service" do
+            @provider.stubs(:enabled?).returns true
+            @provider.expects(:svc).with("-u", "/etc/service/myservice")
+
+            @provider.start
+        end
+
+        it "should enable the service if it is not enabled" do
+            @provider.stubs(:svc)
+
+            @provider.expects(:enabled?).returns false
             @provider.expects(:enable)
+
             @provider.start
         end
     end
 
     describe "when stopping" do
-        it "should call disable" do
-            @provider.expects(:disable)
+        it "should use 'svc' to stop the service" do
+            @provider.stubs(:disable)
+            @provider.expects(:svc).with("-d", "/etc/service/myservice")
+
             @provider.stop
         end
     end
 
+    describe "when restarting" do
+        it "should use 'svc' to restart the service" do
+            @provider.expects(:svc).with("-t", "/etc/service/myservice")
+
+            @provider.restart
+        end
+    end
+
     describe "when enabling" do
         it "should create a symlink between daemon dir and service dir" do
             FileTest.stubs(:symlink?).returns(false)
@@ -80,21 +107,19 @@ describe provider_class do
     end
 
     describe "when disabling" do
-        it "should stop and then remove the symlink between daemon dir and service dir" do
+        it "should remove the symlink between daemon dir and service dir" do
             FileTest.stubs(:directory?).returns(false)
             FileTest.stubs(:symlink?).returns(true)
-            File.expects(:unlink).with(File.join(@servicedir,"myservice")).returns(0)
+            File.expects(:unlink).with(File.join(@servicedir,"myservice"))
             @provider.stubs(:texecute).returns("")
             @provider.disable
         end
-    end
 
-    describe "when disabling" do
-        it "should also call 'svc -dx /etc/service/myservice'" do
+        it "should stop the service" do
             FileTest.stubs(:directory?).returns(false)
             FileTest.stubs(:symlink?).returns(true)
-            File.expects(:unlink).with(File.join(@servicedir,"myservice")).returns(0)
-            @provider.expects(:texecute).with("stop",  [nil, '-dx', File.join(@servicedir,"myservice")]).returns ""
+            File.stubs(:unlink)
+            @provider.expects(:stop)
             @provider.disable
         end
     end