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

25 files changed, 72 insertions, 628 deletions

diff --git a/test/data/providers/ssh_authorized_key/parsed/authorized_keys1 b/test/data/providers/ssh_authorized_key/parsed/authorized_keys1
new file mode 100644
index 000000000..7aa0647ca
--- /dev/null
+++ b/test/data/providers/ssh_authorized_key/parsed/authorized_keys1
@@ -0,0 +1,3 @@
+1024 35 167576894966720957580065952882142495543043407324667405194097438434880798807651864847570827148390962746149410384891026772700627764845955493549511618975091512997118590589399665757714186775228807376424903966072778732134483862302766419277581465932186641863495699668069439475320990051723279127881281145164415361627 francois@korn
+2048 35 27332429396020032283276339339051507284036000350350092862949624519871013308460312287866673933080560923221560798334008554200019645416448528663000202951887890525621015333936122655294782671001073795264378070156670395703161543893088138531854776737799752600933431638059304355933305878665812555436198516842364330938321746086651639330436648850787370397302524667456837036413634152938122227368132322078811602953517461933179827432019932348409533535942749570969101453655028606209719023224268890314608444789012688070463327764203306501923404494017305972543000091038543051645924928018568725584728655193415567703220002707737714942757 francois@korn
+from="192.168.1.1",command="/bin/false",no-pty,no-port-forwarding 2048 35 27332429396020032283276339339051507284036000350350092862949624519871013308460312287866673933080560923221560798334008554200019645416448528663000202951887890525621015333936122655294782671001073795264378070156670395703161543893088138531854776737799752600933431638059304355933305878665812555436198516842364330938321746086651639330436648850787370397302524667456837036413634152938122227368132322078811602953517461933179827432019932348409533535942749570969101453655028606209719023224268890314608444789012688070463327764203306501923404494017305972543000091038543051645924928018568725584728655193415567703220002707737714942757 francois@korn
diff --git a/test/data/snippets/arithmetic_expression.pp b/test/data/snippets/arithmetic_expression.pp
new file mode 100644
index 000000000..aae98a4db
--- /dev/null
+++ b/test/data/snippets/arithmetic_expression.pp
@@ -0,0 +1,8 @@
+
+$one = 1.30
+$two = 2.034e-2
+
+$result = ((( $two + 2) / $one) + 4 * 5.45) - (6 << 7) + (0x800 + -9)
+
+
+notice("result is $result == 1295.87692307692")
\ No newline at end of file
diff --git a/test/data/snippets/emptyifelse.pp b/test/data/snippets/emptyifelse.pp
new file mode 100644
index 000000000..598b486ac
--- /dev/null
+++ b/test/data/snippets/emptyifelse.pp
@@ -0,0 +1,9 @@
+
+if false {
+} else {
+  # nothing here
+}
+
+if true {
+  # still nothing
+}
diff --git a/test/data/snippets/ifexpression.rb b/test/data/snippets/ifexpression.rb
new file mode 100644
index 000000000..eea3b855b
--- /dev/null
+++ b/test/data/snippets/ifexpression.rb
@@ -0,0 +1,6 @@
+$one = 1
+$two = 2
+
+if ($one < $two) and (($two < 3) or ($two == 2)) {
+    notice("True!")
+}
diff --git a/test/language/ast/resource_reference.rb b/test/language/ast/resource_reference.rb
index 1f554d90f..75cb53c12 100755
--- a/test/language/ast/resource_reference.rb
+++ b/test/language/ast/resource_reference.rb
@@ -23,34 +23,6 @@ class TestASTResourceReference < Test::Unit::TestCase
         @parser = @scope.compiler.parser
     end
 
-    def test_evaluate
-        @parser.newdefine "one::two"
-        @parser.newdefine "one-two"
-        [%w{File /tmp/yay}, %w{One::Two three}, %w{One-two three}].each do |type, title|
-            ref = newref(type, title)
-
-            evaled = nil
-            assert_nothing_raised("Could not evaluate resource ref") do
-                evaled = ref.evaluate(@scope)
-            end
-
-            assert_equal(type, evaled.type, "Type did not translate correctly")
-            assert_equal(title, evaled.title, "Title did not translate correctly")
-        end
-    end
-
-    def test_finding_classes_for_reference
-        @parser.newclass "one"
-        ref = newref("Class", "one")
-        evaled = nil
-        assert_nothing_raised("Could not evaluate resource ref") do
-            evaled = ref.evaluate(@scope)
-        end
-
-        assert_equal("Class", evaled.type, "Did not set type to 'class'")
-        assert_equal("one", evaled.title, "Did not look up class corectly")
-    end
-
     # Related to #706, make sure resource references correctly translate to qualified types.
     def test_scoped_references
         @parser.newdefine "one"
diff --git a/test/language/functions.rb b/test/language/functions.rb
index 50a61a148..d9a1a561d 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -278,7 +278,7 @@ class TestLangFunctions < Test::Unit::TestCase
         file = tempfile()
 
         Puppet[:code] = %{file { "#{file}": content => template("#{template}") }}
-        Puppet[:environments] = "yay"
+        Puppet[:environment] = "yay"
         interp = Puppet::Parser::Interpreter.new
         node = mknode
         node.stubs(:environment).returns("yay")
diff --git a/test/lib/puppettest/reporttesting.rb b/test/lib/puppettest/reporttesting.rb
index 9b1764cf6..4d88c3cfc 100644
--- a/test/lib/puppettest/reporttesting.rb
+++ b/test/lib/puppettest/reporttesting.rb
@@ -6,8 +6,6 @@ module PuppetTest::Reporttesting
         3.times { |i|
             # We have to use warning so that the logs always happen
             log = Puppet.warning("Report test message %s" % i)
-            log.tags = %w{a list of tags}
-            log.tags << "tag%s" % i
 
             report.newlog(log)
         }
diff --git a/test/lib/puppettest/runnable_test.rb b/test/lib/puppettest/runnable_test.rb
index e3cde5052..6dab1b743 100644
--- a/test/lib/puppettest/runnable_test.rb
+++ b/test/lib/puppettest/runnable_test.rb
@@ -12,6 +12,8 @@ module PuppetTest
             end
         end
 
+        attr_reader :messages
+
         # Evaluate all of our tests to see if any of them are false
         # and thus whether this test is considered not runnable.
         def runnable?
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 24c7b6374..e27b7a3a2 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -402,12 +402,9 @@ end
             client.send(:splay)
         end
 
-        time = Puppet::Util::Storage.cache(:configuration)[:splay_time]
-        assert(time, "Splay time was not cached")
-
         # Now try it again
         client = mkclient
-        client.expects(:sleep).with(time)
+        client.expects(:sleep)
 
         assert_nothing_raised("Failed to call sleep when splay is true with a cached value") do
             client.send(:splay)
@@ -419,8 +416,7 @@ end
         assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts")
 
         # Now set it to a real value
-        Puppet[:environments] = "something,else"
-        Puppet[:environment] = "something"
+	Puppet[:environment] = "something"
         facts = Puppet::Network::Client::Master.facts
         assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts")
     end
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index b3a9aef2b..1046617ec 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -433,6 +433,14 @@ class TestFileServer < Test::Unit::TestCase
         assert_nil(retval, "Description of non-existent mounts returned a value")
     end
 
+    def test_describe_does_not_fail_when_mount_does_not_find_file
+        server = Puppet::Network::Handler.fileserver.new(:Local => true, :Config => false)
+
+        assert_nothing_raised("Failed when describing missing plugins") do
+            server.describe "/plugins"
+        end
+    end
+
     # test that our config file is parsing and working as planned
     def test_configfile
         server = nil
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index bbdc021b9..0de38414a 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -25,7 +25,9 @@ class TestMaster < Test::Unit::TestCase
         now1 = mock 'now1'
         Time.expects(:now).returns(now1)
 
-        assert_equal(@master.freshness, now1, "Did not return current time as freshness")
+        now1.expects(:to_i).returns 10
+
+        assert_equal(@master.freshness, 10, "Did not return current time as freshness")
     end
 
     def test_hostname_is_used_if_client_is_missing
diff --git a/test/other/report.rb b/test/other/report.rb
index 9894e2a8d..9d0bb4852 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -21,7 +21,7 @@ class TestReports < Test::Unit::TestCase
             # Make every third file
             File.open(file, "w") { |f| f.puts "" } if i % 3 == 0
 
-            objects << Puppet::Type.newfile(
+            objects << Puppet::Type.type(:file).create(
                 :path => file,
                 :ensure => "file"
             )
@@ -44,7 +44,7 @@ class TestReports < Test::Unit::TestCase
         }
 
         # Now make a file for testing logging
-        file = Puppet::Type.newfile(:path => tempfile(), :ensure => "file")
+        file = Puppet::Type.type(:file).create(:path => tempfile(), :ensure => "file")
         file.finish
 
         log = nil
@@ -91,8 +91,6 @@ class TestReports < Test::Unit::TestCase
 
         3.times { |i|
             log = Puppet.warning("Report test message %s" % i)
-            log.tags = %w{a list of tags}
-            log.tags << "tag%s" % i
 
             report.newlog(log)
         }
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index 2dce5aa6a..ad1375b13 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -248,7 +248,7 @@ class TestTransactions < Test::Unit::TestCase
 
         assert_nothing_raised() {
             check.each { |property|
-                value = file.value(property)
+                value = file.property(property).retrieve
                 assert(value)
                 properties[property] = value
             }
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
diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb
index e35b66fbd..8977c81b5 100755
--- a/test/ral/type/filesources.rb
+++ b/test/ral/type/filesources.rb
@@ -291,11 +291,9 @@ class TestFileSources < Test::Unit::TestCase
         # Lastly, make sure we return an empty array when no sources are there
         obj[:source] = [nosource, tempfile()]
         
-        assert_nothing_raised do
+        assert_raise(Puppet::Error) do
             result, sourced = obj.sourcerecurse(true)
         end
-        assert_equal([], sourced, "Did not get correct list of sourced objects")
-        assert_equal([], result, "Sourcerecurse failed when all sources are missing")
     end
 
     def test_simplelocalsource
diff --git a/test/ral/type/mailalias.rb b/test/ral/type/mailalias.rb
index ff1dd562a..637022330 100755
--- a/test/ral/type/mailalias.rb
+++ b/test/ral/type/mailalias.rb
@@ -34,12 +34,11 @@ class TestMailAlias < Test::Unit::TestCase
     # This isn't much of a test, but then, it's not much of a type.
     def test_recipient_arrays
         resource = @type.create(:name => "luke", :recipient => "yay", :target => tempfile)
-        resource.provider.expects(:recipient).returns([:absent])
         values = nil
         assert_nothing_raised("Could not retrieve mailalias") do
             values = resource.retrieve.inject({}) { |hash, a| hash[a[0].name] = a[1]; hash }
         end
-        assert_equal([:absent], values[:recipient])
+        assert_equal(:absent, values[:recipient])
         resource.property(:recipient).expects(:set).with(%w{yay})
         assert_nothing_raised("Could not sync mailalias") do
             resource.property(:recipient).sync
diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb
index 1a2de2649..02c25ae97 100755
--- a/test/ral/type/user.rb
+++ b/test/ral/type/user.rb
@@ -164,56 +164,6 @@ class TestUser < Test::Unit::TestCase
         assert_equal(old, user.provider.shell, "Shell was not reverted")
     end
 
-    def attrtest_gid(user)
-        obj = nil
-        old = user.provider.gid
-        comp = mk_catalog("gidtest", user)
-
-        user.retrieve
-
-        user[:gid] = old
-
-        trans = assert_events([], comp, "user")
-
-        newgid = %w{nogroup nobody staff users daemon}.find { |gid|
-                begin
-                    group = Etc.getgrnam(gid)
-                rescue ArgumentError => detail
-                    next
-                end
-                old != group.gid and group.gid > 0
-        }
-
-        unless newgid
-            $stderr.puts "Cannot find alternate group; skipping gid test"
-            return
-        end
-
-        # first test by name
-        assert_nothing_raised("Failed to specify group by name") {
-            user[:gid] = newgid
-        }
-
-        trans = assert_events([:user_changed], comp, "user")
-
-        # then by id
-        newgid = Etc.getgrnam(newgid).gid
-
-        assert_nothing_raised("Failed to specify group by id for %s" % newgid) {
-            user[:gid] = newgid
-        }
-
-        user.retrieve
-
-        assert_events([], comp, "user")
-
-        assert_equal(newgid, user.provider.gid, "GID was not changed")
-
-        assert_rollback_events(trans, [:user_changed], "user")
-
-        assert_equal(old, user.provider.gid, "GID was not reverted")
-    end
-
     def attrtest_uid(user)
         obj = nil
         comp = mk_catalog("uidtest", user)
diff --git a/test/util/log.rb b/test/util/log.rb
index 523652f37..8c7703cb9 100755
--- a/test/util/log.rb
+++ b/test/util/log.rb
@@ -114,44 +114,6 @@ class TestLog < Test::Unit::TestCase
         assert(FileTest.file?(file))
     end
 
-    def test_logtags
-        path = tempfile
-        File.open(path, "w") { |f| f.puts "yayness" }
-
-        file = Puppet.type(:file).create(
-            :path => path,
-            :check => [:owner, :group, :mode, :checksum],
-            :ensure => :file
-        )
-        file.tags = %w{this is a test}
-
-        property = file.property(:ensure)
-        assert(property, "Did not get property")
-        log = nil
-        assert_nothing_raised {
-            log = Puppet::Util::Log.new(
-                :level => :info,
-                :source => property,
-                :message => "A test message"
-            )
-        }
-
-        # Now yaml and de-yaml it, and test again
-        yamllog = YAML.load(YAML.dump(log))
-
-        {:log => log, :yaml => yamllog}.each do |type, msg|
-            assert(msg.tags, "Got no tags")
-
-            msg.tags.each do |tag|
-                assert(msg.tagged?(tag), "Was not tagged with %s" % tag)
-            end
-
-            assert_equal(msg.tags, property.tags, "Tags were not equal")
-            assert_equal(msg.source, property.path, "Source was not set correctly")
-        end
-
-    end
-
     # Verify that we can pass strings that match printf args
     def test_percentlogs
         Puppet::Util::Log.newdestination :syslog
@@ -182,27 +144,6 @@ class TestLog < Test::Unit::TestCase
         assert_instance_of(String, msg.source)
     end
 
-    # Verify that loglevel behaves as one expects
-    def test_loglevel
-        path = tempfile()
-        file = Puppet.type(:file).create(
-            :path => path,
-            :ensure => "file"
-        )
-
-        assert_nothing_raised {
-            assert_equal(:notice, file[:loglevel])
-        }
-
-        assert_nothing_raised {
-            file[:loglevel] = "warning"
-        }
-
-        assert_nothing_raised {
-            assert_equal(:warning, file[:loglevel])
-        }
-    end
-
     def test_destination_matching
         dest = nil
         assert_nothing_raised {
diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb
deleted file mode 100755
index f64a95d18..000000000
--- a/test/util/posixtest.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2006-11-07.
-#  Copyright (c) 2006. All rights reserved.
-
-require File.dirname(__FILE__) + '/../lib/puppettest'
-
-require 'puppettest'
-require 'puppet/util/posix'
-
-class TestPosixUtil < Test::Unit::TestCase
-	include PuppetTest
-	include Puppet::Util::POSIX
-	
-	def mk_posix_resource(type, obj)
-	    field = idfield(type)
-        res = Puppet::Type.type(type).create(
-            :name => obj.name,
-            field => obj.send(field)
-        )
-        res.setdefaults
-        res
-    end
-	
-	def test_get_posix_field
-	    {:group => nonrootgroup, :passwd => nonrootuser}.each do |space, obj|
-            id = Puppet::Util.idfield(space)
-	        [obj.name, obj.send(id)].each do |test|
-        	    value = nil
-        	    assert_nothing_raised do
-        	        value = get_posix_field(space, :name, test)
-        	    end
-        	    assert_equal(obj.name, value, "did not get correct value from get_posix_field (known to be broken on some platforms)")
-    	    end
-	    end
-    end
-    
-    def test_search_posix_field
-        {:group => nonrootgroup, :passwd => nonrootuser}.each do |space, obj|
-              id = Puppet::Util.idfield(space)
-            [obj.name, obj.send(id)].each do |test|
-                value = nil
-                assert_nothing_raised do
-                    value = search_posix_field(space, :name, test)
-                end
-                assert_equal(obj.name, value, "did not get correct value from search_posix_field")
-            end
-        end
-      end
-    
-    def test_get_provider_value
-        user = nonrootuser
-        obj = mk_posix_resource(:user, user)
-        
-        assert_nothing_raised do
-            assert_equal(user.uid, get_provider_value(:user, :uid, user.uid))
-            assert_equal(user.name, get_provider_value(:user, :name, user.name))
-        end
-    end
-    
-    def test_gid_and_uid
-        {:user => nonrootuser, :group => nonrootgroup}.each do |type, obj|
-            method = idfield(type)
-            # First make sure we get it back with both name and id with no object
-            [obj.name, obj.send(method)].each do |value|
-                assert_equal(obj.send(method), send(method, value))
-            end
-            
-            # Now make a Puppet resource and make sure we get it from that.
-            resource = mk_posix_resource(type, obj)
-            
-            [obj.name, obj.send(method)].each do |value|
-                assert_equal(obj.send(method), send(method, value))
-            end
-        end
-    end
-    
-    def test_util_methods
-        assert(Puppet::Util.respond_to?(:uid), "util does not have methods")
-    end
-    
-    # First verify we can convert a known user
-    def test_gidbyname
-        %x{groups}.split(" ").each { |group|
-            gid = nil
-            assert_nothing_raised {
-                gid = Puppet::Util.gid(group)
-            }
-
-            assert(gid, "Could not retrieve gid for %s" % group)
-        }
-    end
-
-    # Then verify we can retrieve a known group by gid
-    def test_gidbyid
-        %x{groups}.split(" ").each { |group|
-            obj = Puppet.type(:group).create(
-                :name => group,
-                :check => [:gid]
-            )
-            obj.setdefaults
-            current = obj.retrieve
-            id = nil
-            current.find { |prop, value| id = value if prop.name == :gid }
-            gid = nil
-            assert_nothing_raised {
-                gid = Puppet::Util.gid(id)
-            }
-
-            assert(gid, "Could not retrieve gid for %s" % group)
-            assert_equal(id, gid, "Got mismatched ids")
-        }
-    end
-
-    # Finally, verify that we can find groups by id even if we don't
-    # know them
-    def test_gidbyunknownid
-        gid = nil
-        group = Puppet::Util::SUIDManager.gid
-        assert_nothing_raised {
-            gid = Puppet::Util.gid(group)
-        }
-
-        assert(gid, "Could not retrieve gid for %s" % group)
-        assert_equal(group, gid, "Got mismatched ids")
-    end
-
-    def user
-        require 'etc'
-        unless defined? @user
-            obj = Etc.getpwuid(Puppet::Util::SUIDManager.uid)
-            @user = obj.name
-        end
-        return @user
-    end
-
-    # And do it all over again for users
-    # First verify we can convert a known user
-    def test_uidbyname
-        user = user()
-        uid = nil
-        assert_nothing_raised {
-            uid = Puppet::Util.uid(user)
-        }
-
-        assert(uid, "Could not retrieve uid for %s" % user)
-        assert_equal(Puppet::Util::SUIDManager.uid, uid, "UIDs did not match")
-    end
-
-    # Then verify we can retrieve a known user by uid
-    def test_uidbyid
-        user = user()
-        obj = Puppet.type(:user).create(
-            :name => user,
-            :check => [:uid]
-        )
-        obj.setdefaults
-        obj.retrieve
-        id = obj.provider.uid
-        uid = nil
-        assert_nothing_raised {
-            uid = Puppet::Util.uid(id)
-        }
-
-        assert(uid, "Could not retrieve uid for %s" % user)
-        assert_equal(id, uid, "Got mismatched ids")
-    end
-
-    # Finally, verify that we can find users by id even if we don't
-    # know them
-    def test_uidbyunknownid
-        uid = nil
-        user = Puppet::Util::SUIDManager.uid
-        assert_nothing_raised {
-            uid = Puppet::Util.uid(user)
-        }
-
-        assert(uid, "Could not retrieve uid for %s" % user)
-        assert_equal(user, uid, "Got mismatched ids")
-    end
-end
-