diff options
| -rw-r--r-- | lib/puppet/reports/store.rb | 1 | ||||
| -rwxr-xr-x | test/other/config.rb | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb index c8d7cdfce..cb0aa0a3c 100644 --- a/lib/puppet/reports/store.rb +++ b/lib/puppet/reports/store.rb @@ -15,6 +15,7 @@ Puppet::Server::Report.newreport(:store, :useyaml => true) do config.setdefaults("reportclient-#{client}", "clientdir-#{client}" => { :default => dir, :mode => 0750, + :desc => "Client dir for %s" % client, :owner => Puppet[:user], :group => Puppet[:group] } diff --git a/test/other/config.rb b/test/other/config.rb index a35509e94..ca8fff4e7 100755 --- a/test/other/config.rb +++ b/test/other/config.rb @@ -406,7 +406,7 @@ yay = /a/path section = "testing" assert_nothing_raised { c.setdefaults(section, - :myfile => {:default => file, :create => true} + :myfile => {:default => file, :create => true, :desc => "yay"} ) } @@ -436,6 +436,7 @@ yay = /a/path :default => file, :owner => "pptest", :group => "pptest", + :desc => "yay", :create => true } ) @@ -530,7 +531,7 @@ yay = /a/path config = mkconfig - args = { :default => path, :mode => mode } + args = { :default => path, :mode => mode, :desc => "yay" } user = nonrootuser() group = nonrootgroup() @@ -568,7 +569,7 @@ yay = /a/path config = mkconfig - args = { :default => path, :mode => mode } + args = { :default => path, :mode => mode, :desc => "a file" } user = nonrootuser() group = nonrootgroup() @@ -690,6 +691,7 @@ inttest = 27 elem = config.newelement( :name => value, :default => value, + :desc => name.to_s, :section => :yayness ) } @@ -822,6 +824,7 @@ inttest = 27 assert_nothing_raised do elem = config.newelement :default => "yay", :name => :blocktest, + :desc => "boo", :section => :test, :hook => proc { |value| testing = value } end @@ -853,6 +856,7 @@ inttest = 27 config.setdefaults :test, :blocktest2 => { :default => "yay", + :desc => "yay", :hook => proc { |v| testing = v } } end |