From 23f982ecda3fd74867d404b5e784f072db9a1cde Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Sat, 7 Jan 2006 23:33:38 +0000
Subject: Undoing the merge that happened in 785

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@786 980ebf18-57e1-0310-9a29-db15c13687c0
---
 test/executables/puppetmodule.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'test/executables/puppetmodule.rb')

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
-- 
cgit