summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/puppet/defaults.rb2
-rwxr-xr-xtest/util/metrics.rb5
2 files changed, 1 insertions, 6 deletions
diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb
index 7befb9fa2..d53c23217 100755
--- a/test/puppet/defaults.rb
+++ b/test/puppet/defaults.rb
@@ -11,7 +11,7 @@ class TestPuppetDefaults < Test::Unit::TestCase
@@dirs = %w{rrddir confdir vardir logdir statedir}
@@files = %w{statefile manifest masterlog}
@@normals = %w{puppetport masterport server}
- @@booleans = %w{rrdgraph noop}
+ @@booleans = %w{noop}
def testVersion
assert( Puppet.version =~ /^[0-9]+(\.[0-9]+)*/, "got invalid version number %s" % Puppet.version )
diff --git a/test/util/metrics.rb b/test/util/metrics.rb
index b3219fc1a..6dcb84119 100755
--- a/test/util/metrics.rb
+++ b/test/util/metrics.rb
@@ -49,11 +49,6 @@ class TestMetric < PuppetTest::TestCase
}
end
- def setup
- super
- Puppet[:rrdgraph] = true
- end
-
def test_fakedata
report = Puppet::Transaction::Report.new
time = Time.now.to_i