summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-18 23:47:54 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-18 23:47:54 +0000
commit90bdc33e440eba602426f709b31b8fca430e19d6 (patch)
treec09b1abb7934962b51ac7833bdaeefecb6dd14cd /test
parente952029322eab81580e9c05f5310d78068d2f9bf (diff)
downloadpuppet-90bdc33e440eba602426f709b31b8fca430e19d6.tar.gz
puppet-90bdc33e440eba602426f709b31b8fca430e19d6.tar.xz
puppet-90bdc33e440eba602426f709b31b8fca430e19d6.zip
Adding test to make sure ensure does not conflict with any of the creating types.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2300 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test')
-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