puppet 0.22.4 → 0.23.0

data/test/ral/providers/group.rb

@@ -30,13 +30,13 @@ class TestGroupProvider < Test::Unit::TestCase
     end
 
     def mkgroup(name, hash = {})
-        fakemodel = fakemodel(:group, name)
+        fakeresource = fakeresource(:group, name)
         group = nil
         assert_nothing_raised {
-            group = @provider.new(fakemodel)
+            group = @provider.new(fakeresource)
         }
         hash.each do |name, val|
-            fakemodel[name] = val
+            fakeresource[name] = val
         end
         assert(group, "Could not create provider group")
 
@@ -167,9 +167,9 @@ class TestGroupProvider < Test::Unit::TestCase
         groupnames().each { |group|
             gobj = nil
             comp = nil
-            fakemodel = fakemodel(:group, group)
+            fakeresource = fakeresource(:group, group)
             assert_nothing_raised {
-                gobj = @provider.new(fakemodel)
+                gobj = @provider.new(fakeresource)
             }
 
             assert(gobj.gid, "Failed to retrieve gid")
@@ -223,7 +223,7 @@ class TestGroupProvider < Test::Unit::TestCase
             # Not all OSes fail here, so we can't test that it doesn't work with
             # it off, only that it does work with it on.
             assert_nothing_raised {
-                group2.model[:allowdupe] = :true
+                group2.resource[:allowdupe] = :true
             }
 
             # Now create the second group
@@ -249,4 +249,4 @@ class TestGroupProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: group.rb 2178 2007-02-07 23:56:59Z luke $
+# $Id: group.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -20,17 +20,16 @@ class TestNetinfoHostProvider < Test::Unit::TestCase
 	def test_list
 	    list = nil
 	    assert_nothing_raised do
-	        list = @provider.list
+	        list = @provider.instances
         end
         assert(list.length > 0)
-        list.each do |obj|
-            prov = obj.provider
-            assert_instance_of(@host, obj)
+        list.each do |prov|
+            assert_instance_of(@provider, prov)
             assert(prov.name, "objects do not have names")
             assert(prov.ip, "Did not get value for device in %s" % prov.ip)
         end
 
-        assert(list.detect { |m| m.provider.name == "localhost"}, "Could not find localhost")
+        assert(list.detect { |provider| provider.name == "localhost"}, "Could not find localhost")
     end
     
     if Process.uid == 0
@@ -55,4 +54,4 @@ end
 end
 end
 
-# $Id: netinfo.rb 2170 2007-02-07 17:21:52Z luke $
+# $Id: netinfo.rb 2552 2007-06-05 01:17:00Z luke $

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

@@ -53,9 +53,9 @@ class TestParsedHostProvider < Test::Unit::TestCase
     def mkhost
         hash = mkhosthash()
 
-        fakemodel = fakemodel(:host, hash[:name])
+        fakeresource = fakeresource(:host, hash[:name])
 
-        host = @provider.new(fakemodel)
+        host = @provider.new(fakeresource)
 
         assert(host, "Could not create provider host")
         hash.each do |name, val|
@@ -214,7 +214,7 @@ class TestParsedHostProvider < Test::Unit::TestCase
 
         # And verify that we have data for everything
         hosts.each { |host|
-            name = host.model[:name]
+            name = host.resource[:name]
             assert(text.include?(name), "Host %s is not in file" % name)
             hash = host.property_hash
             assert(! hash.empty?, "Could not find host %s" % name)
@@ -223,4 +223,4 @@ class TestParsedHostProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: parsed.rb 2296 2007-03-18 22:48:57Z luke $
+# $Id: parsed.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -51,9 +51,9 @@ class TestParsedMounts < Test::Unit::TestCase
         hash = mkmountargs()
         #hash[:provider] = @provider.name
 
-        fakemodel = fakemodel(:mount, hash[:name])
+        fakeresource = fakeresource(:mount, hash[:name])
 
-        mount = @provider.new(fakemodel)
+        mount = @provider.new(fakeresource)
         assert(mount, "Could not create provider mount")
         hash[:record_type] = :parsed
         hash[:ensure] = :present
@@ -122,6 +122,10 @@ class TestParsedMounts < Test::Unit::TestCase
                 assert(hashes.length > 0, "Did not create any hashes")
                 root = hashes.find { |i| i[:name] == "/" }
                 assert(root, "Could not retrieve root mount")
+
+                assert_nothing_raised("Could not rewrite file") do
+                    @provider.to_file(hashes)
+                end
             end
         end
 
@@ -133,12 +137,13 @@ class TestParsedMounts < Test::Unit::TestCase
 
             assert(FileTest.exists?(@provider.default_target),
                 "FSTab %s does not exist" % @provider.default_target)
+
             assert_nothing_raised do
-                @provider.prefetch
+                @provider.prefetch("/" => type)
             end
 
-            assert_equal(:present, provider.property_hash[:ensure],
-                "Could not find root fs with provider %s" % provider.name)
+            assert_equal(:present, type.provider.property_hash[:ensure],
+                "Could not find root fs with provider %s" % provider.class.name)
 
             assert_nothing_raised {
                 assert(provider.mounted?, "Root is considered not mounted")
@@ -220,4 +225,4 @@ class TestParsedMounts < Test::Unit::TestCase
     end
 end
 
-# $Id: parsed.rb 2445 2007-05-01 03:45:09Z luke $
+# $Id: parsed.rb 2624 2007-06-19 01:49:19Z luke $

data/test/ral/providers/nameservice.rb

@@ -11,7 +11,7 @@ class TestNameServiceProvider < Test::Unit::TestCase
 
     def test_option
         klass = Class.new(Puppet::Provider::NameService)
-        klass.model = Puppet::Type.type(:user)
+        klass.resource_type = Puppet::Type.type(:user)
 
         val = nil
         assert_nothing_raised {
@@ -30,4 +30,4 @@ class TestNameServiceProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: nameservice.rb 2170 2007-02-07 17:21:52Z luke $
+# $Id: nameservice.rb 2501 2007-05-09 23:08:42Z luke $

data/test/ral/providers/package.rb

@@ -8,6 +8,11 @@ require 'etc'
 class TestPackageProvider < Test::Unit::TestCase
 	include PuppetTest
 
+    def setup
+        super
+        Puppet.info @method_name
+    end
+
     # Load the testpackages hash.
     def self.load_test_packages
         require 'yaml'
@@ -81,7 +86,7 @@ class TestPackageProvider < Test::Unit::TestCase
         assert((result == :listed or result.is_a?(Hash)),
             "query did not return hash or :listed")
         if result == :listed
-            assert(provider.model.is(:ensure) != :absent, msg)
+            assert(provider.resource.is(:ensure) != :absent, msg)
         else
             assert(result[:ensure] != :absent, msg)
         end
@@ -150,8 +155,12 @@ class TestPackageProvider < Test::Unit::TestCase
 
         cleanup do
             if pkg.provider.respond_to?(:uninstall)
-                pkg[:ensure] = :absent
-                assert_apply(pkg)
+                pkg.provider.flush
+                if pkg.provider.properties[:ensure] != :absent
+                    assert_nothing_raised("Could not clean up package") do
+                        pkg.provider.uninstall
+                    end
+                end
             else
                 if cleancmd
                     system(cleancmd)
@@ -159,6 +168,13 @@ class TestPackageProvider < Test::Unit::TestCase
             end
         end
 
+        # Now call 'latest' after the package is installed
+        if provider.respond_to?(:latest)
+            assert_nothing_raised("Could not call 'latest'") do
+                provider.latest
+            end
+        end
+
         assert_nothing_raised("Could not install package") do
             provider.install
         end
@@ -168,26 +184,35 @@ class TestPackageProvider < Test::Unit::TestCase
         # If there are any remaining files, then test upgrading from there
         unless files.empty?
             pkg[:source] = files.shift
-            current = provider.query
+            current = provider.properties
             assert_nothing_raised("Could not upgrade") do
                 provider.update
             end
-            new = provider.query
+            provider.flush
+            new = provider.properties
             assert(current != new, "package was not upgraded: %s did not change" %
                 current.inspect)
         end
 
         unless versions.empty?
             pkg[:ensure] = versions.shift
-            current = provider.query
+            current = provider.properties
             assert_nothing_raised("Could not upgrade") do
                 provider.update
             end
-            new = provider.query
+            provider.flush
+            new = provider.properties
             assert(current != new, "package was not upgraded: %s did not change" %
                 current.inspect)
         end
 
+        # Now call 'latest' after the package is installed
+        if provider.respond_to?(:latest)
+            assert_nothing_raised("Could not call 'latest'") do
+                provider.latest
+            end
+        end
+
         # Now remove the package
         if provider.respond_to?(:uninstall)
             assert_nothing_raised do
@@ -234,20 +259,20 @@ class TestPackageProvider < Test::Unit::TestCase
 
     # Make sure all of the suitable providers on our platform can successfully
     # list.
-    def test_listing
+    def test_instances
         Puppet::Type.type(:package).suitableprovider.each do |provider|
             result = nil
             assert_nothing_raised("Could not list %s packages" % provider.name) do
-                result = provider.list
+                result = provider.instances
             end
             result.each do |pkg|
-                assert_instance_of(Puppet::Type.type(:package), pkg,
-                    "%s returned non-package" % provider.name)
-                assert_equal(provider.name, pkg.provider.class.name,
-                    "%s did not set provider correctly" % provider.name)
+                assert_instance_of(provider, pkg,
+                    "%s returned non-provider" % provider.name)
+                assert_equal(provider.name, pkg.class.name,
+                    "Provider %s returned an instance of a different provider" %  provider.name)
             end
         end
     end
 end
 
-# $Id: package.rb 2170 2007-02-07 17:21:52Z luke $
+# $Id: package.rb 2595 2007-06-17 00:06:46Z luke $

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

@@ -28,7 +28,7 @@ class AptPackageProviderTest < PuppetTest::TestCase
 							  'faff'
 					  ).returns(
 					        "deinstall ok config-files faff 1.2.3-1\n"
-					  )
+					  ).times(1)
 
 		pkg.provider.expects(
 		                 :aptget
@@ -56,7 +56,7 @@ class AptPackageProviderTest < PuppetTest::TestCase
 					        'faff'
 					  ).returns(
 					        "install ok installed faff 1.2.3-1\n"
-					  )
+					  ).times(1)
 		pkg.provider.expects(
 		                 :aptget
 					  ).with(
@@ -70,6 +70,75 @@ class AptPackageProviderTest < PuppetTest::TestCase
 		pkg.evaluate.each { |state| state.transaction = self; state.forward }
 	end
 
+	def test_dont_try_to_purge_if_already_purged
+		pkg = @type.create :name => 'faff', :provider => :apt, :ensure => :purged
+
+		pkg.provider.expects(
+		                 :dpkgquery
+					  ).with(
+					        '-W',
+					        '--showformat',
+					        '${Status} ${Package} ${Version}\n',
+					        'faff'
+					  ).raises(
+					        Puppet::ExecutionFailure,
+					        "No packages found matching faff.\n"
+					  ).times(1)
+		pkg.provider.expects(
+		                 :aptget
+					  ).never
+		
+		pkg.evaluate.each { |state| state.transaction = self; state.forward }
+	end
+
+	def test_dont_try_to_purge_if_already_purged_and_we_want_it_absent
+		pkg = @type.create :name => 'faff', :provider => :apt, :ensure => :absent
+
+		pkg.provider.expects(
+		                 :dpkgquery
+					  ).with(
+					        '-W',
+					        '--showformat',
+					        '${Status} ${Package} ${Version}\n',
+					        'faff'
+					  ).raises(
+					        Puppet::ExecutionFailure,
+					        "No packages found matching faff.\n"
+					  ).times(1)
+		pkg.provider.expects(
+		                 :aptget
+					  ).never
+
+		pkg.evaluate.each { |state| state.transaction = self; state.forward }
+	end
+
+	def test_make_sure_we_purge_if_package_still_has_conffiles
+		pkg = @type.create :name => 'faff', :provider => :apt, :ensure => :purged
+
+		pkg.provider.expects(
+		                 :dpkgquery
+					  ).with(
+					        '-W',
+					        '--showformat',
+					        '${Status} ${Package} ${Version}\n',
+					        'faff'
+					  ).returns(
+					        "deinstall ok config-files faff 1.2.3-1\n"
+					  ).times(1)
+		pkg.provider.expects(
+		                 :aptget
+					  ).with(
+					        '-y',
+					        '-q',
+					        'remove',
+					        '--purge',
+					        'faff'
+					  ).returns(0)
+		
+		pkg.evaluate.each { |state| state.transaction = self; state.forward }
+	end
+	
+
     def test_latest
 		pkg = @type.create :name => 'base-files', :provider => :apt
 
@@ -86,4 +155,4 @@ class AptPackageProviderTest < PuppetTest::TestCase
     end
 end
 
-# $Id: apt.rb 2390 2007-04-06 15:49:38Z luke $
+# $Id: apt.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -19,16 +19,16 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 		                   :ensure => :present,
 		                   :source => "/tmp/faff.deb"
 
-		pkg.provider.expects(
-		                 :dpkgquery
-					  ).with(
-							  '-W',
-							  '--showformat',
-							  '${Status} ${Package} ${Version}\n',
-							  'faff'
-					  ).returns(
-					        "deinstall ok config-files faff 1.2.3-1\n"
-					  )
+ 		pkg.provider.expects(
+ 		                 :dpkgquery
+ 					  ).with(
+ 							  '-W',
+ 							  '--showformat',
+ 							  '${Status} ${Package} ${Version}\n',
+ 							  'faff'
+ 					  ).returns(
+ 					        "deinstall ok config-files faff 1.2.3-1\n"
+ 					  ).times(1)
 
 		pkg.provider.expects(
 		                 :aptitude
@@ -40,7 +40,10 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 		                 'faff'
 					  ).returns(0)
 		
-		pkg.evaluate.each { |state| state.transaction = self; state.forward }
+		pkg.evaluate.each { |state| 
+                    state.transaction = self 
+                    state.forward 
+          }
 	end
 	
 	def test_purge
@@ -55,7 +58,7 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 					        'faff'
 					  ).returns(
 					        "install ok installed faff 1.2.3-1\n"
-					  )
+					  ).times(1)
 		pkg.provider.expects(
 		                 :aptitude
 					  ).with(

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

@@ -28,7 +28,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                             '--nodigest',
                             '--qf',
                             "%{NAME}-%{VERSION}-%{RELEASE} %{VERSION}-%{RELEASE}\n"
-                      ).raises(Puppet::ExecutionFailure, "couldn't find rpm")
+                      ).raises(Puppet::ExecutionFailure, "couldn't find rpm").times(1)
 
         pkg.provider.expects(
                          :aptget
@@ -56,7 +56,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                         "%{NAME}-%{VERSION}-%{RELEASE} %{VERSION}-%{RELEASE}\n"
                     ).returns(
                         "faff-1.2.3-1 1.2.3-1\n"
-                    )
+                    ).times(1)
         pkg.provider.expects(
                         :aptget
                     ).with(
@@ -86,4 +86,4 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
     end
 end
 
-# $Id: aptrpm.rb 2430 2007-04-30 15:19:23Z luke $
+# $Id: aptrpm.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -27,7 +27,7 @@ class DpkgPackageProviderTest < PuppetTest::TestCase
 							  'faff'
 					  ).returns(
 					        "deinstall ok config-files faff 1.2.3-1\n"
-					  )
+					  ).times(1)
 
 		pkg.provider.expects(
 		                 :dpkg
@@ -51,7 +51,7 @@ class DpkgPackageProviderTest < PuppetTest::TestCase
 					        'faff'
 					  ).returns(
 					        "install ok installed faff 1.2.3-1\n"
-					  )
+					  ).times(1)
 		pkg.provider.expects(
 		                 :dpkg
 					  ).with(