Undoing the merge that happened in 785

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

2 files changed, 2 insertions, 9 deletions

diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index f16ccbbf2..d075d8431 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -35,9 +35,7 @@ class TestPuppetBin < Test::Unit::TestCase
 
         output = nil
         cmd = "puppet"
-        if Puppet[:debug]
-            cmd += " --debug"
-        end
+        cmd += " --verbose"
         #cmd += " --fqdn %s" % fqdn
         cmd += " --confdir %s" % Puppet[:puppetconf]
         cmd += " --vardir %s" % Puppet[:puppetvar]
diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb
index 429e29e36..2e97a963a 100755
--- a/test/executables/puppetmodule.rb
+++ b/test/executables/puppetmodule.rb
@@ -19,15 +19,11 @@ libdirs = $:.find_all { |dir|
 }
 ENV["RUBYLIB"] = libdirs.join(":")
 
-$module = File.join($puppetbase, "ext", "module_puppet")
+$module = File.join($puppetbase, "ext", "module:puppet")
 
 class TestPuppetModule < Test::Unit::TestCase
 	include ServerTest
 
-    def test_existence
-        assert(FileTest.exists?($module), "Module does not exist")
-    end
-
     def test_execution
         file = tempfile()
 
@@ -45,7 +41,6 @@ class TestPuppetModule < Test::Unit::TestCase
         cmd += " --vardir %s" % Puppet[:puppetvar]
         if Puppet[:debug]
             cmd += " --logdest %s" % "console"
-            cmd += " --debug"
         else
             cmd += " --logdest %s" % "/dev/null"
         end