updates

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

6 files changed, 10 insertions, 6 deletions

diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index c91c1456c..f1897e0e5 100644
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -38,7 +38,7 @@ class TestTransactions < Test::Unit::TestCase
             serv[:running] = false
             serv.sync
         }
-        print "\n\n" if Puppet[:debug]
+        #print "\n\n" if Puppet[:debug]
         super
     end
 
diff --git a/test/puppettest.rb b/test/puppettest.rb
index 604d95d81..e2c620bb8 100644
--- a/test/puppettest.rb
+++ b/test/puppettest.rb
@@ -54,6 +54,8 @@ module TestPuppet
 
 
     def spin
+        # Just disable spin, unless we really need it
+        return
         if Puppet[:debug]
             return
         end
diff --git a/test/server/ca.rb b/test/server/ca.rb
index b48cb42c7..99b79fea2 100644
--- a/test/server/ca.rb
+++ b/test/server/ca.rb
@@ -23,7 +23,7 @@ class TestCA < Test::Unit::TestCase
 	include ServerTest
     def teardown
         super
-        print "\n\n" if Puppet[:debug]
+        #print "\n\n" if Puppet[:debug]
     end
 
     # Verify that we're autosigning.  We have to autosign a "different" machine,
diff --git a/test/server/master.rb b/test/server/master.rb
index df5d092d7..f7b91fa9c 100644
--- a/test/server/master.rb
+++ b/test/server/master.rb
@@ -18,7 +18,7 @@ class TestMaster < Test::Unit::TestCase
 	include ServerTest
     def teardown
         super
-        print "\n\n\n\n" if Puppet[:debug]
+        #print "\n\n\n\n" if Puppet[:debug]
     end
 
     # run through all of the existing test files and make sure everything
diff --git a/test/server/server.rb b/test/server/server.rb
index aa75b1422..be9923b40 100644
--- a/test/server/server.rb
+++ b/test/server/server.rb
@@ -25,7 +25,7 @@ class TestServer < Test::Unit::TestCase
 	include ServerTest
     def teardown
         super
-        print "\n\n\n\n" if Puppet[:debug]
+        #print "\n\n\n\n" if Puppet[:debug]
     end
 
     # test that we can connect to the server
diff --git a/test/test b/test/test
index 3f2bce2ae..acea0fa25 100755
--- a/test/test
+++ b/test/test
@@ -3,8 +3,10 @@
 #------------------------------------------------------------
 # run any or all test suites
 
-$:.unshift '.'
-$:.unshift '../lib'
+basedir = File.dirname(__FILE__)
+
+$:.unshift basedir
+$:.unshift '#{basedir}/lib'
 
 $puppetbase = ".."