Fix for #565: Final merge of changes from source:branches/execute-refactor into source:trunk

Generated with
svn merge -r 2378:HEAD https://reductivelabs.com/svn/puppet/branches/execute-refactor trunk

CHANGES:
 - Puppet::Util#execute now takes hash key/value pairs as arguments after the command array.
 - Processes executed from the base service provider are now silenced.  That is, their
   standard input, output, and error pipes are all directed to /dev/null.


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

1 files changed, 10 insertions, 5 deletions

diff --git a/test/README b/test/README
index 80d98b4bd..82a749a69 100644
--- a/test/README
+++ b/test/README
@@ -1,5 +1,15 @@
 $Id$
 
+To run all tests, run: 'rake test'.  To run an individual suite, run the file
+directly.  e.g. cd test/util; ./utiltest.rb
+
+You might need to run some tests as root.
+
+If you do not have rake installed:
+  gem install rake
+
+## The following information is possibly out of date?
+
 Tests are organized into a dual hierarchy: each subdirectory is
 considered a test suite, and each file in the subdirectory is considered
 a test case.  You can use any test case as an example of how to write
@@ -12,8 +22,3 @@ if __FILE__ == $0
     $:.unshift '../../lib'
     $blinkbase = "../.."
 end
-
-To run all tests, just type './test'.  To run an individual suite, run
-'./test <suite>'.  To run an individual case, cd into the suite
-subdirectory and run './tc_<case>.rb'.  Tests are basically guaranteed
-not to work without cd'ing into the subdirectory.