summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtest/ral/types/file.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb
index cd3c7548a..caf01fecd 100755
--- a/test/ral/types/file.rb
+++ b/test/ral/types/file.rb
@@ -1649,6 +1649,10 @@ class TestFile < Test::Unit::TestCase
second = tempfile()
params = [:content, :source, :target]
params.each do |param|
+ assert_nothing_raised("%s conflicted with ensure" % [param]) do
+ Puppet::Type.newfile(:path => file, param => first, :ensure => :file)
+ end
+ Puppet::Type.type(:file).clear
params.each do |other|
next if other == param
assert_raise(Puppet::Error, "%s and %s did not conflict" % [param, other]) do