diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 14:01:49 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 15:35:41 -0700 |
| commit | 6dd1930ff66f6e89ff3d7edba9cc20126d9cd9a3 (patch) | |
| tree | 9932df38550e12ba2afbef60e8a1d6cb51569ca6 /test/util | |
| parent | d057b90bba4ffe7174e9af789835d5528e8a200d (diff) | |
| download | puppet-6dd1930ff66f6e89ff3d7edba9cc20126d9cd9a3.tar.gz puppet-6dd1930ff66f6e89ff3d7edba9cc20126d9cd9a3.tar.xz puppet-6dd1930ff66f6e89ff3d7edba9cc20126d9cd9a3.zip | |
Fix test failures that fixing #4726 exposed.
The patch for #4726 causes old unit tests of the rrd reporting
infrastructure to run on my machine. These tests were calling the old
report api, which does not succeed.
Also, the rrd settings had unintentionally been moved out of the
:metrics section, making it possible that the rrd report directory would
fail to get created during testing.
Diffstat (limited to 'test/util')
| -rwxr-xr-x | test/util/metrics.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/util/metrics.rb b/test/util/metrics.rb index 1fd57f2f1..82e792d0b 100755 --- a/test/util/metrics.rb +++ b/test/util/metrics.rb @@ -8,7 +8,7 @@ require 'puppettest' require 'puppet/type' class TestMetric < PuppetTest::TestCase - confine "Missing RRDtool library" => Puppet.features.rrd? + confine "Missing RRDtool library" => (Puppet.features.rrd? || Puppet.features.rrd_legacy?) include PuppetTest def gendata @@ -43,7 +43,7 @@ class TestMetric < PuppetTest::TestCase def rundata(report, time) assert_nothing_raised { gendata.each do |name, data| - report.newmetric(name, data) + report.add_metric(name, data) end report.metrics.each { |n, m| m.store(time) } } |