diff options
| -rw-r--r-- | lib/puppet/type/pfile.rb | 4 | ||||
| -rwxr-xr-x | test/ral/types/file.rb | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb index 116c8880d..d92a1e03d 100644 --- a/lib/puppet/type/pfile.rb +++ b/lib/puppet/type/pfile.rb @@ -103,7 +103,9 @@ module Puppet @parent.bucket = value value end - when Puppet::Network::Client::Dipper: value.name + when Puppet::Network::Client::Dipper: + @parent.bucket = value + value.name else self.fail "Invalid backup type %s" % value.inspect diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb index b7f6cda2e..5b5f19299 100755 --- a/test/ral/types/file.rb +++ b/test/ral/types/file.rb @@ -2059,7 +2059,18 @@ class TestFile < Test::Unit::TestCase assert_nothing_raised do assert_nil(oobj.eval_generate, "recursed too far") end + end + + # Make sure we default to the "puppet" filebucket, rather than a string + def test_backup_defaults_to_bucket + path = tempfile + file = Puppet::Type.newfile(:path => path, :content => 'some content') + file.finish + assert_instance_of(Puppet::Network::Client::Dipper, file.bucket, + "did not default to a filebucket for backups") + assert_equal(Puppet::Type.type(:filebucket)["puppet"].bucket, file.bucket, + "did not default to the 'puppet' filebucket") end end |