diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-11-08 05:22:24 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-11-08 05:22:24 +0000 |
| commit | 744ded30a02883dd8ce5fbf2b847f10acb226d6e (patch) | |
| tree | d962b7b21f3a5d20dafd8e7f862c23a2449c2c9b /test/other/metrics.rb | |
| parent | dc4d98091a5566be289830839f1d6eb39367b42c (diff) | |
| download | puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.tar.gz puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.tar.xz puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.zip | |
Merging the code over from the oscar branch. I will now be doing all development in the trunk again, except for larger changes, which will still get their own branch. This is a merge of the changes from revision 1826 to revision 1834.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1835 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/other/metrics.rb')
| -rwxr-xr-x | test/other/metrics.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/test/other/metrics.rb b/test/other/metrics.rb index 049d00093..a2904b2a5 100755 --- a/test/other/metrics.rb +++ b/test/other/metrics.rb @@ -7,14 +7,7 @@ require 'puppet' require 'puppettest' require 'puppet/type' -$haverrd = true -begin - require 'RRD' -rescue LoadError - $haverrd = false -end - -if $haverrd +if Puppet.features.rrd? class TestMetric < Test::Unit::TestCase include PuppetTest |