Fixing #339, and the bigger problem it concealed. Metaparams are now only added to resources that do not explicitly set them.

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

2 files changed, 8 insertions, 1 deletions

diff --git a/test/language/resource.rb b/test/language/resource.rb
index a9a0a7ef6..f7786a774 100755
--- a/test/language/resource.rb
+++ b/test/language/resource.rb
@@ -296,7 +296,8 @@ class TestResource < Test::Unit::TestCase
     def test_addmetaparams
         mkevaltest @interp
         res = Parser::Resource.new :type => "evaltest", :title => "yay",
-            :source => @source, :scope => @scope
+            :source => @source, :scope => @scope,
+            :params => paramify(@source, :tag => "yay")
 
         assert_nil(res[:schedule], "Got schedule already")
         assert_nothing_raised do
@@ -304,11 +305,15 @@ class TestResource < Test::Unit::TestCase
         end
         @scope.setvar("schedule", "daily")
 
+        # This is so we can test that it won't override already-set metaparams
+        @scope.setvar("tag", "funtest")
+
         assert_nothing_raised do
             res.addmetaparams
         end
 
         assert_equal("daily", res[:schedule], "Did not get metaparam")
+        assert_equal("yay", res[:tag], "Overrode explicitly-set metaparam")
         assert_nil(res[:noop], "Got invalid metaparam")
     end
 
diff --git a/test/server/runner.rb b/test/server/runner.rb
index daec78c4d..2d904f504 100755
--- a/test/server/runner.rb
+++ b/test/server/runner.rb
@@ -72,6 +72,8 @@ class TestServerRunner < Test::Unit::TestCase
                 ["yayness"], true, false, true],
             ["with a third good tag",
                 "yayness", true, false, true],
+            ["with no tags",
+                "", true, false, true],
             ["not ignoring schedules",
                 nil, false, false, false],
             ["ignoring schedules",