summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-09-13 23:34:06 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-09-13 23:34:06 -0700
commit9e66daa27ce65028f48dd13c67e066d3cc2c766a (patch)
tree1f878b8c4ee9cb02863f4bdc8ef3f97772da9168 /test
parent9e72ccd8ff087d0cf4a1396401e3843311b4e6d4 (diff)
parentcad1e0f69ca19b37901f7f289444feae8f9ebd34 (diff)
downloadpuppet-9e66daa27ce65028f48dd13c67e066d3cc2c766a.tar.gz
puppet-9e66daa27ce65028f48dd13c67e066d3cc2c766a.tar.xz
puppet-9e66daa27ce65028f48dd13c67e066d3cc2c766a.zip
Merge commit '2.6.1' into next
Diffstat (limited to 'test')
-rwxr-xr-xtest/ral/manager/attributes.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb
index 74a4d0708..6d0284d9e 100755
--- a/test/ral/manager/attributes.rb
+++ b/test/ral/manager/attributes.rb
@@ -229,7 +229,10 @@ class TestTypeAttributes < Test::Unit::TestCase
end
yes.each { |a| assert(resource.should(a), "Did not get value for #{a} in #{prov.name}") }
no.each do |a|
- # These may or may not get passed to the provider. We shouldn't care.
+ assert_nil(resource.should(a), "Got value for unsupported %s in %s" % [a, prov.name])
+ if Puppet::Util::Log.sendlevel?(:info)
+ assert(@logs.find { |l| l.message =~ /not managing attribute #{a}/ and l.level == :info }, "No warning about failed %s" % a)
+ end
end
@logs.clear