Redoing reporting a bit, so that reports are now defined as methods. If they are not methods, then they cannot use return, which makes things a bit uglier.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1359 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 7 insertions, 6 deletions

diff --git a/test/other/report.rb b/test/other/report.rb
index 435b7790d..2aa78172c 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -88,14 +88,18 @@ class TestReports < Test::Unit::TestCase
             trans.evaluate
         }
 
-        code = Puppet::Server::Report.report("rrdgraph")
+        method = Puppet::Server::Report.report("rrdgraph")
+        server = nil
+        assert_nothing_raised {
+            server = Puppet::Server::Report.new()
+        }
 
         assert_nothing_raised {
-            code.call(trans.report)
+            server.report_rrdgraph(trans.report)
         }
     end
     else
-    $stderr.puts "Install RRD for metric graphing tests"
+    $stderr.puts "Install RRD for metric reporting tests"
     end
 end
 
diff --git a/test/server/report.rb b/test/server/report.rb
index e504710e9..5ab84f919 100755
--- a/test/server/report.rb
+++ b/test/server/report.rb
@@ -71,9 +71,6 @@ class TestReportServer < Test::Unit::TestCase
             end
         end
     end
-
-    def test_rrdgraph_report
-    end
 end
 
 # $Id$