A couple of small fixes to pass existing tests.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2012 980ebf18-57e1-0310-9a29-db15c13687c0

4 files changed, 33 insertions, 4 deletions

diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb
index 68cb13b63..a959e34db 100755
--- a/lib/puppet/provider/package/aptitude.rb
+++ b/lib/puppet/provider/package/aptitude.rb
@@ -7,6 +7,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt do
     ENV['DEBIAN_FRONTEND'] = "noninteractive"
 
     def aptcmd(*args)
+        args.flatten!
         # Apparently aptitude hasn't always supported a -q flag.
         if args.include?("-q")
             args.delete("-q")
diff --git a/test/language/scope.rb b/test/language/scope.rb
index 9178f95d0..05c5e524e 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -460,7 +460,6 @@ class TestScope < Test::Unit::TestCase
     # scope.
     def test_storeandcollect
         Puppet[:storeconfigs] = true
-        Puppet::Rails.clear
         Puppet::Rails.init
         sleep 1
         children = []
diff --git a/test/providers/mount/parsed.rb b/test/providers/mount/parsed.rb
index d4d3376af..e4450ee0e 100755
--- a/test/providers/mount/parsed.rb
+++ b/test/providers/mount/parsed.rb
@@ -190,12 +190,12 @@ class TestParsedMounts < Test::Unit::TestCase
         }
         assert(! obj.mounted?, "FS still mounted")
         # Check the actual output of df
-        assert(! obj.df(nil).include?(fs), "%s is still listed in df" % fs)
+        assert(! obj.df().include?(fs), "%s is still listed in df" % fs)
         assert_nothing_raised {
             obj.mount
         }
         assert(obj.mounted?, "FS not mounted")
-        assert(obj.df(nil).include?(fs), "%s is not listed in df" % fs)
+        assert(obj.df().include?(fs), "%s is not listed in df" % fs)
 
     end
     end
diff --git a/test/rails/host.rb b/test/rails/host.rb
index 9c3ce3d16..852341be9 100755
--- a/test/rails/host.rb
+++ b/test/rails/host.rb
@@ -106,9 +106,22 @@ class TestRailsHost < Test::Unit::TestCase
 
         assert_equal(20, count, "Did not get enough resources")
 
-        # Now remove a couple of resources and change a fact
+        # Now remove a couple of resources
         resources.reject! { |r| r.title =~ /file9/ }
+
+        # Change a few resources
+        resources.find_all { |r| r.title =~ /file8/ }.each do |r|
+            r.set("loglevel", "notice", r.source)
+        end
+
+        # And add a new resource
+        resources << mkresource(:type => "file",
+            :title => "/tmp/file_added",
+            :params => {:owner => "user_added"})
+
+        # And change some facts
         facts["test2"] = "yaytest"
+        facts["test3"] = "funtest"
         facts.delete("test1")
         host = nil
         assert_nothing_raised {
@@ -127,6 +140,22 @@ class TestRailsHost < Test::Unit::TestCase
 
         assert(! host.resources.find(:all).detect { |r| r.title =~ /file9/ },
             "Removed resources are still present")
+
+        res = host.resources.find_by_title("/tmp/file_added")
+        assert(res, "New resource was not added")
+        p res.parameters
+        assert_equal("user_added", res.parameter("owner"), "user info was not stored")
+
+        count = 0
+        host.resources.find(:all).find_all { |r| r.title =~ /file8/ }.each do |r|
+            assert_equal("notice", r.parameter("loglevel"),
+                "loglevel was not added")
+            if r.type == "file"
+                assert_equal("fake", r.parameter("owner"), "owner was not modified")
+            else
+                assert_equal("fake", r.parameter("user"), "user was not modified")
+            end
+        end
     end
     else
         $stderr.puts "Install Rails for Rails and Caching tests"