puppet 0.23.2 → 0.24.0

data/test/ral/providers/group.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'etc'
@@ -249,4 +249,3 @@ class TestGroupProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: group.rb 2501 2007-05-09 23:08:42Z luke $

data/test/ral/providers/host/netinfo.rb

@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-12.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
 
@@ -54,4 +54,3 @@ end
 end
 end
 
-# $Id: netinfo.rb 2552 2007-06-05 01:17:00Z luke $

data/test/ral/providers/host/parsed.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'etc'
 require 'puppettest'
@@ -223,4 +223,3 @@ class TestParsedHostProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: parsed.rb 2501 2007-05-09 23:08:42Z luke $

data/test/ral/providers/mailalias/aliases.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/fileparsing'
@@ -54,4 +54,3 @@ class TestMailaliasAliasesProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: aliases.rb 2676 2007-07-10 23:24:34Z luke $

data/test/ral/providers/mount/netinfo.rb

@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-12.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
 # 
@@ -77,4 +77,3 @@ require 'puppettest'
 # end
 # end
 
-# $Id: netinfo.rb 2170 2007-02-07 17:21:52Z luke $

data/test/ral/providers/nameservice.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/provider/nameservice'
@@ -30,4 +30,3 @@ class TestNameServiceProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: nameservice.rb 2501 2007-05-09 23:08:42Z luke $

data/test/ral/providers/package.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'etc'
@@ -72,7 +72,7 @@ class TestPackageProvider < Test::Unit::TestCase
         if result.nil?
             assert_nil(result)
         elsif result.is_a?(Hash)
-            assert_equal(:absent, result[:ensure], msg)
+            assert (result[:ensure] == :absent or result[:ensure] == :purged), msg
         else
             raise "dunno how to handle %s" % result.inspect
         end
@@ -146,10 +146,12 @@ class TestPackageProvider < Test::Unit::TestCase
 
         assert(provider, "Could not retrieve provider")
 
+        return if result = provider.query and ! [:absent, :purged].include?(result[:ensure])
+
         assert_absent(provider)
 
         if Process.uid != 0
-            $stderr.puts "Run as root for full package tests"
+            Puppet.info "Run as root for full package tests"
             return
         end
 
@@ -275,4 +277,3 @@ class TestPackageProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: package.rb 2595 2007-06-17 00:06:46Z luke $

data/test/ral/providers/package/apt.rb

@@ -167,4 +167,3 @@ class AptPackageProviderTest < PuppetTest::TestCase
     end
 end
 
-# $Id: apt.rb 2714 2007-07-19 18:12:20Z luke $

data/test/ral/providers/package/aptrpm.rb

@@ -86,4 +86,3 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
     end
 end
 
-# $Id: aptrpm.rb 2555 2007-06-08 17:20:00Z luke $

data/test/ral/providers/parsedfile.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -695,5 +695,4 @@ class TestParsedFile < Test::Unit::TestCase
     end
 end
 
-# $Id: parsedfile.rb 2750 2007-08-06 17:59:37Z luke $
 

data/test/ral/providers/port/parsed.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
 #require 'puppettest/fileparsing'
@@ -230,4 +230,3 @@ require 'puppettest'
 #    end
 #end
 
-# $Id: parsed.rb 2501 2007-05-09 23:08:42Z luke $

data/test/ral/providers/provider.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'facter'
@@ -456,11 +456,17 @@ class TestProviderFeatures < Test::Unit::TestCase
             :none => [:nomeths]}
 
         should.each do |name, features|
-            provider = @type.provider(name)
+            provider_class = @type.provider(name)
+            provider = provider_class.new({})
+
             assert(provider, "did not get provider named %s" % name)
             features.sort! { |a,b| a.to_s <=> b.to_s }
-            assert_equal(features, provider.features,
-                "Got incorrect feature list for %s" % name)
+            assert_equal(features, provider.features, "Got incorrect feature list for provider instance %s" % name)
+            assert_equal(features, provider_class.features, "Got incorrect feature list for provider class %s" % name)
+            features.each do |feat| 
+                assert(provider.feature?(feat), "Provider instance %s did not have feature %s" % [name, feat])
+                assert(provider_class.feature?(feat), "Provider class %s did not have feature %s" % [name, feat])
+            end
         end
     end
 
@@ -500,4 +506,3 @@ class TestProviderFeatures < Test::Unit::TestCase
     end
 end
 
-# $Id: provider.rb 2551 2007-06-04 20:37:14Z luke $

data/test/ral/providers/service/base.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-01-28.
 #  Copyright (c) 2007. All rights reserved.
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
 
@@ -72,4 +72,3 @@ class TestBaseServiceProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: base.rb 2170 2007-02-07 17:21:52Z luke $

data/test/ral/providers/service/debian.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+#
+#  Created by David Schmitt on 2007-09-13
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
+
+require 'puppettest'
+
+class TestDebianServiceProvider < Test::Unit::TestCase
+    include PuppetTest
+    include Puppet::Util
+
+    def prepare_provider(servicename, output)
+        @resource = mock 'resource'
+        @resource.stubs(:[]).with(:name).returns("myresource")
+        provider = Puppet::Type.type(:service).provider(:debian).new(@resource)
+
+        provider.stubs(:update).returns(output)
+
+        provider
+    end
+
+    def assert_enabled( servicename, output)
+        provider = prepare_provider( servicename, output )
+        assert_equal(:true, provider.enabled?,
+                     "Service provider=debian thinks service is disabled, when it isn't")
+    end
+
+    def assert_disabled( servicename, output )
+        provider = prepare_provider( servicename, output )
+        assert_equal(:false, provider.enabled?,
+                     "Service provider=debian thinks service is enabled, when it isn't")
+    end
+
+    # Testing #822
+    def test_file_rc
+        # These messages are from file-rc's
+        # update-rc.d -n -f $service remove
+        assert_enabled("test1", "/etc/runlevel.tmp not installed as /etc/runlevel.conf\n")
+        assert_disabled("test2", "Nothing to do.\n")
+    end
+
+    def test_sysv_rc
+        # These messages are from file-rc's
+        # update-rc.d -n -f $service remove
+        assert_enabled("test3", """ Removing any system startup links for /etc/init.d/test3 ...
+    /etc/rc0.d/K11test3
+    /etc/rc1.d/K11test3
+    /etc/rc2.d/S89test3
+    /etc/rc3.d/S89test3
+    /etc/rc4.d/S89test3
+    /etc/rc5.d/S89test3
+    /etc/rc6.d/K11test3
+""")
+        assert_disabled("test4", " Removing any system startup links for /etc/init.d/test4 ...\n")
+    end
+end

data/test/ral/providers/sshkey/parsed.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/fileparsing'
@@ -108,4 +108,3 @@ class TestParsedSSHKey < Test::Unit::TestCase
     end
 end
 
-# $Id: parsed.rb 2501 2007-05-09 23:08:42Z luke $

data/test/ral/providers/user.rb

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 
 class TestUserProvider < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
 
     def setup
@@ -563,4 +565,3 @@ class TestUserProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: user.rb 2555 2007-06-08 17:20:00Z luke $

data/test/ral/providers/user/useradd.rb

@@ -243,4 +243,3 @@ class UserRootAddProviderTest < PuppetTest::TestCase
 end
 
 
-# $Id: useradd.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/basic.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -35,12 +35,9 @@ class TestBasic < Test::Unit::TestCase
                 :path => ENV["PATH"]
             )
         }
-        assert_nothing_raised() {
-            @component.push(
-                @configfile,
-                @command
-            )
-        }
+        @config = mk_catalog(@component, @configfile, @command)
+        @config.add_edge! @component, @configfile
+        @config.add_edge! @component, @command
     end
 
     def teardown
@@ -86,5 +83,3 @@ class TestBasic < Test::Unit::TestCase
         }
     end
 end
-
-# $Id: basic.rb 2170 2007-02-07 17:21:52Z luke $

data/test/ral/types/cron.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
-require 'spec'
 
 # Test cron job creation, modification, and destruction
 
@@ -18,8 +17,7 @@ class TestCron < Test::Unit::TestCase
         @crontype = Puppet::Type.type(:cron)
         @provider = @crontype.defaultprovider
         if @provider.respond_to?(:filetype=)
-            @oldfiletype = @provider.filetype
-            @provider.filetype = :ram
+            @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         end
         @crontype = Puppet::Type.type(:cron)
     end
@@ -27,9 +25,6 @@ class TestCron < Test::Unit::TestCase
     def teardown
         super
         @crontype.defaultprovider = nil
-        if defined? @oldfiletype
-            @provider.filetype = @oldfiletype
-        end
         Puppet::Util::FileType.filetype(:ram).clear
     end
 
@@ -95,7 +90,7 @@ class TestCron < Test::Unit::TestCase
 
         text = obj.read
         name = cron.name
-        comp = newcomp(name, cron)
+        comp = mk_catalog(name, cron)
 
         assert_events([:cron_created], comp)
         cron.provider.class.prefetch
@@ -158,7 +153,7 @@ class TestCron < Test::Unit::TestCase
     def test_makeandretrievecron
         %w{storeandretrieve a-name another-name more_naming SomeName}.each do |name|
             cron = mkcron(name)
-            comp = newcomp(name, cron)
+            comp = mk_catalog(name, cron)
             trans = assert_events([:cron_created], comp, name)
             
             cron.provider.class.prefetch
@@ -469,9 +464,9 @@ class TestCron < Test::Unit::TestCase
             inst = @crontype.create(
                 :name => "something", :command => "/some/thing",
                 :provider => :crontab)
-            assert_equal(ENV["USER"], inst.should(:user),
+            assert_equal(Etc.getpwuid(Process.uid).name, inst.should(:user),
                 "user did not default to current user with crontab")
-            assert_equal(ENV["USER"], inst.should(:target),
+            assert_equal(Etc.getpwuid(Process.uid).name, inst.should(:target),
                 "target did not default to current user with crontab")
 
             # Now make a new cron with a user, and make sure it gets copied
@@ -502,4 +497,3 @@ class TestCron < Test::Unit::TestCase
 end
 
 
-# $Id: cron.rb 2750 2007-08-06 17:59:37Z luke $

data/test/ral/types/exec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -179,7 +179,7 @@ class TestExec < Test::Unit::TestCase
             )
         }
 
-        comp = newcomp("createstest", exec)
+        comp = mk_catalog("createstest", exec)
         assert_events([:executed_command], comp, "creates")
         assert_events([], comp, "creates")
     end
@@ -202,7 +202,7 @@ class TestExec < Test::Unit::TestCase
             :require => [:file, oexe]
         )
 
-        comp = newcomp("Testing", file, exec)
+        comp = mk_catalog("Testing", file, exec)
 
         assert_events([:file_created, :executed_command], comp)
     end
@@ -299,7 +299,7 @@ class TestExec < Test::Unit::TestCase
                 :path => ENV['PATH']
             )
         }
-        comp = newcomp(exec)
+        comp = mk_catalog(exec)
 
         assert_events([:executed_command], comp)
         assert_events([:executed_command], comp)
@@ -344,7 +344,7 @@ class TestExec < Test::Unit::TestCase
                 exec = Puppet.type(:exec).create(args)
             }
 
-            comp = newcomp("usertest", exec)
+            comp = mk_catalog("usertest", exec)
             assert_events([:executed_command], comp, "usertest")
 
             assert(FileTest.exists?(file), "File does not exist")
@@ -425,7 +425,7 @@ class TestExec < Test::Unit::TestCase
             )
         }
 
-        comp = newcomp(file, exec)
+        comp = mk_catalog(file, exec)
         comp.finalize
         assert_events([:executed_command, :file_changed], comp)
 
@@ -728,4 +728,3 @@ and stuff"
     end
 end
 
-# $Id: exec.rb 2442 2007-04-30 19:42:58Z luke $