puppet 0.24.5 → 0.24.6

data/test/language/snippets.rb

@@ -446,6 +446,20 @@ class TestSnippets < Test::Unit::TestCase
             "Did not make second file from duplicate subclass names")
     end
 
+    def snippet_funccomma
+        assert_file("/tmp/funccomma1",
+            "Did not make first file from trailing function comma")
+        assert_file("/tmp/funccomma2",
+            "Did not make second file from trailing function comma")
+    end
+
+    def snippet_arraytrailingcomma
+        assert_file("/tmp/arraytrailingcomma1",
+            "Did not make first file from array")
+        assert_file("/tmp/arraytrailingcomma2",
+            "Did not make second file from array")
+    end
+
     # Iterate across each of the snippets and create a test.
     Dir.entries(snippetdir).sort.each { |file|
         next if file =~ /^\./

data/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)
         }

data/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?

data/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

data/test/network/handler/fileserver.rb

@@ -437,6 +437,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

data/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

data/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)
         }

data/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
             }

data/test/ral/providers/group.rb

@@ -30,14 +30,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
@@ -108,19 +112,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
@@ -211,7 +215,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"
@@ -222,16 +225,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

data/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
 

data/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

data/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..

data/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