The resolve functionality in "test" is almost working...

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

2 files changed, 1 insertions, 14 deletions

diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index cda91e77b..2354722a9 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -17,17 +17,6 @@ module PuppetTest
     def self.munge_argv
         require 'getoptlong'
 
-        def resolve(dir, method)
-        end
-
-        def ruby_files(dir)
-            files = []
-            # First collect the entire file list.
-            find(dir) { |f| files << f if f =~ /\.rb$/ }
-            files
-        end
-
-            #[ "--size",	"-s",			GetoptLong::REQUIRED_ARGUMENT ],
         result = GetoptLong.new(
             [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
             [ "--resolve",	"-r",			GetoptLong::REQUIRED_ARGUMENT ],
@@ -35,7 +24,7 @@ module PuppetTest
             [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ]
         )
 
-        usage = "USAGE: %s [--help] <testsuite> <testsuite> .." % $0
+        usage = "USAGE: TESTOPTS='[-n <method> -n <method> ...] [-d]' rake [target] [target] ..."
 
         opts = []
 
diff --git a/test/lib/rake/puppet_test_loader.rb b/test/lib/rake/puppet_test_loader.rb
index 83531c677..a85cc8e6b 100644
--- a/test/lib/rake/puppet_test_loader.rb
+++ b/test/lib/rake/puppet_test_loader.rb
@@ -5,8 +5,6 @@ require 'puppettest'
 
 args = PuppetTest.munge_argv
 
-p $puppet_debug
-
 args.each { |f| require f unless f =~ /^-/  }
 
 runner = Test::Unit::AutoRunner.new(false)