Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,

since that method is deprecated.

Conflicts:

	CHANGELOG
	bin/puppetca
	lib/puppet/file_serving/fileset.rb
	lib/puppet/network/xmlrpc/client.rb
	lib/puppet/type/file/selcontext.rb
	spec/unit/file_serving/metadata.rb
	spec/unit/type/file.rb

7 files changed, 25 insertions, 289 deletions

diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb
index f912ec51a..baea08132 100755
--- a/test/ral/providers/group.rb
+++ b/test/ral/providers/group.rb
@@ -29,14 +29,18 @@ class TestGroupProvider < Test::Unit::TestCase
     end
 
     def mkgroup(name, hash = {})
-        fakeresource = fakeresource(:group, name)
+        fakeresource = stub 'group', :allowdupe? => false, :name => name
+        fakeresource.stubs(:[]).returns nil
+        fakeresource.stubs(:should).returns nil
+        fakeresource.stubs(:[]).with(:name).returns name
+        hash.each do |name, val|
+            fakeresource.stubs(:should).with(name).returns val
+            fakeresource.stubs(:[]).with(name).returns val
+        end
         group = nil
         assert_nothing_raised {
             group = @provider.new(fakeresource)
         }
-        hash.each do |name, val|
-            fakeresource[name] = val
-        end
         assert(group, "Could not create provider group")
 
         return group
@@ -107,19 +111,19 @@ class TestGroupProvider < Test::Unit::TestCase
     def attrtest_ensure(group)
         old = group.ensure
         assert_nothing_raised {
-            group.ensure = :absent
+            group.delete
         }
 
         assert(!group.exists?, "Group was not deleted")
 
         assert_nothing_raised {
-            group.ensure = :present
+            group.create
         }
         assert(group.exists?, "Group was not created")
 
         unless old == :present
             assert_nothing_raised {
-                group.ensure = old
+                group.delete
             }
         end
     end
@@ -210,7 +214,6 @@ class TestGroupProvider < Test::Unit::TestCase
         unless Facter["operatingsystem"].value == "FreeBSD"
         def test_duplicateIDs
             group1 = mkgroup("group1", :gid => 125)
-            group2 = mkgroup("group2", :gid => 125)
 
             @@tmpgroups << "group1"
             @@tmpgroups << "group2"
@@ -221,16 +224,14 @@ 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.resource[:allowdupe] = :true
-            }
+            group2 = mkgroup("group2", :gid => 125)
+            group2.resource.stubs(:allowdupe?).returns true
 
             # Now create the second group
             assert_nothing_raised {
                 group2.create
             }
-            assert_equal(:present, group2.ensure,
-                         "Group did not get created")
+            assert_equal(:present, group2.ensure, "Group did not get created")
         end
         end
     else
diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb
index f2d28d0f0..3b61c1abd 100755
--- a/test/ral/providers/package.rb
+++ b/test/ral/providers/package.rb
@@ -244,36 +244,5 @@ class TestPackageProvider < Test::Unit::TestCase
             pkg[:adminfile] = "/usr/local/pkg/admin_file"
         end
     end
-
-    # Make sure providers throw an error when you tell them to install a
-    # non-existent package.
-    def test_no_such_package
-        Puppet::Type.type(:package).suitableprovider.each do |provider|
-            assert_raise(ArgumentError, Puppet::Error, Puppet::ExecutionFailure,
-                "Successfully installed nonexistent package with %s" % provider.name) {
-                pkg = Puppet::Type.newpackage :name => "nosuch%s" % provider.name.to_s,
-                    :provider => provider.name
-                provider = pkg.provider
-                provider.install
-            }
-        end
-    end
-
-    # Make sure all of the suitable providers on our platform can successfully
-    # list.
-    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.instances
-            end
-            result.each do |pkg|
-                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
 
diff --git a/test/ral/providers/package/apt.rb b/test/ral/providers/package/apt.rb
deleted file mode 100755
index f4fb1a95c..000000000
--- a/test/ral/providers/package/apt.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
-
-require 'mocha'
-
-class AptPackageProviderTest < PuppetTest::TestCase
-    confine "Apt package provider missing" =>
-        Puppet::Type.type(:package).provider(:apt).suitable?
-
-	def setup
-        super
-		@type = Puppet::Type.type(:package)
-	end
-	
-	def test_install
-		pkg = @type.create :name => 'faff',
-		                   :provider => :apt,
-		                   :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"
-					  ).times(1)
-
-		pkg.provider.expects(
-		                 :aptget
-		           ).with(
-		                 '-q',
-		                 '-y',
-		                 '-o',
-		                 'DPkg::Options::=--force-confold',
-		                 :install,
-		                 'faff'
-					  ).returns(0)
-		
-		pkg.evaluate.each { |state| state.transaction = self; state.forward }
-	end
-	
-	def test_purge
-		pkg = @type.create :name => 'faff', :provider => :apt, :ensure => :purged
-
-		pkg.provider.expects(
-		                 :dpkgquery
-					  ).with(
-					        '-W',
-					        '--showformat',
-					        '${Status} ${Package} ${Version}\n',
-					        'faff'
-					  ).returns(
-					        "install ok installed faff 1.2.3-1\n"
-					  ).times(1)
-		pkg.provider.expects(
-		                 :aptget
-					  ).with(
-					        '-y',
-					        '-q',
-					        'remove',
-					        '--purge',
-					        'faff'
-					  ).returns(0)
-		pkg.provider.expects(
-		                 :dpkg
-					  ).with(
-					        '--purge',
-					        'faff'
-					  ).returns(0)
-		
-		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.provider.expects(
-		                 :dpkg
-					  ).with(
-					        '--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
-
-        assert(pkg, "did not create pkg")
-        status = pkg.provider.query
-        assert(status, "base-files is not installed")
-        assert(status[:ensure] != :absent, "base-files is not installed")
-
-        latest = nil
-        assert_nothing_raised("Could not call latest") do
-            latest = pkg.provider.latest
-        end
-        assert(latest, "Could not get latest value from apt")
-    end
-end
-
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index f8edcebde..881f54047 100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -41,7 +41,6 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 					  ).returns(0)
 		
 		pkg.evaluate.each { |state| 
-                    state.transaction = self 
                     state.forward 
           }
 	end
@@ -67,6 +66,6 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 					        'faff'
 					  ).returns(0)
 		
-		pkg.evaluate.each { |state| state.transaction = self; state.forward }
+		pkg.evaluate.each { |state| state.forward }
 	end
 end
diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb
index c005ee5a6..32e0ea6e5 100755
--- a/test/ral/providers/package/aptrpm.rb
+++ b/test/ral/providers/package/aptrpm.rb
@@ -39,7 +39,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                          'faff'
                     ).returns(0)
         
-        pkg.evaluate.each { |state| state.transaction = self; state.forward }
+        pkg.evaluate.each { |state| state.forward }
     end
     
     def test_uninstall
@@ -66,7 +66,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                         'faff'
                     ).returns(0)
         
-        pkg.evaluate.each { |state| state.transaction = self; state.forward }
+        pkg.evaluate.each { |state| state.forward }
     end
 
     # LAK: I don't know where this test will ever return true..
diff --git a/test/ral/providers/package/dpkg.rb b/test/ral/providers/package/dpkg.rb
deleted file mode 100755
index 7e4427584..000000000
--- a/test/ral/providers/package/dpkg.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
-
-require 'mocha'
-
-class DpkgPackageProviderTest < PuppetTest::TestCase
-    confine "dpkg package provider missing" =>
-        Puppet::Type.type(:package).provider(:dpkg).suitable?
-	def setup
-        super
-		@type = Puppet::Type.type(:package)
-	end
-	
-	def test_install
-		pkg = @type.create :name => 'faff',
-		                   :provider => :dpkg,
-		                   :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"
-					  ).times(1)
-
-		pkg.provider.expects(
-		                 :dpkg
-		           ).with(
-		                 '-i',
-		                 '/tmp/faff.deb'
-					  ).returns(0)
-		
-		pkg.evaluate.each { |state| state.transaction = self; state.forward }
-	end
-	
-	def test_purge
-		pkg = @type.create :name => 'faff', :provider => :dpkg, :ensure => :purged
-
-		pkg.provider.expects(
-		                 :dpkgquery
-					  ).with(
-					        '-W',
-					        '--showformat',
-					        '${Status} ${Package} ${Version}\n',
-					        'faff'
-					  ).returns(
-					        "install ok installed faff 1.2.3-1\n"
-					  ).times(1)
-		pkg.provider.expects(
-		                 :dpkg
-					  ).with(
-					        '--purge',
-					        'faff'
-					  ).returns(0)
-		
-		pkg.evaluate.each { |state| state.transaction = self; state.forward }
-	end
-end
diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb
index 0651d6c74..4df89583b 100755
--- a/test/ral/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -214,20 +214,20 @@ class TestUserProvider < Test::Unit::TestCase
     def attrtest_ensure(user)
         old = user.ensure
         assert_nothing_raised {
-            user.ensure = :absent
+            user.delete
         }
 
         assert(missing?(user.name), "User is still present")
         assert_nothing_raised {
-            user.ensure = :present
+            user.create
         }
         assert(!missing?(user.name), "User is absent")
         assert_nothing_raised {
-            user.ensure = :absent
+            user.delete
         }
 
         unless old == :absent
-            user.ensure = old
+            user.create
         end
     end
 
@@ -398,10 +398,10 @@ class TestUserProvider < Test::Unit::TestCase
 
         # Some tests to verify that groups work correctly startig from nothing
         # Remove our user
-        user.ensure = :absent
+        user.delete
 
         # And add it again
-        user.ensure = :present
+        user.create
 
         # Make sure that the group list is added at creation time.
         # This is necessary because we don't have default fakedata for groups.
@@ -498,8 +498,8 @@ class TestUserProvider < Test::Unit::TestCase
             user2.resource[:uid] = 125
 
             cleanup do
-                user1.ensure = :absent
-                user2.ensure = :absent
+                user1.delete
+                user2.delete
             end
 
             # Not all OSes fail here, so we can't test that it doesn't work with