summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-15 17:32:26 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-15 17:32:26 +0000
commit48992d712bc6d226d117bebd887c0fd42816fc3a (patch)
treea799c010936ae97bdce222d72dfe31790aef4357 /test
parentcda7253b2da3b6980f5cf2846f631597ef249000 (diff)
downloadpuppet-48992d712bc6d226d117bebd887c0fd42816fc3a.tar.gz
puppet-48992d712bc6d226d117bebd887c0fd42816fc3a.tar.xz
puppet-48992d712bc6d226d117bebd887c0fd42816fc3a.zip
Using the "trace" configuration parameter to determine whether a stack trace should be printed, rather than just using "debug". I added the param a little while ago and was using it internally in Puppet::DevError, but I just now went through the whole configuration and switched to using it.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1613 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test')
-rw-r--r--test/puppettest.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/puppettest.rb b/test/puppettest.rb
index a2c3d186c..70775e0e3 100644
--- a/test/puppettest.rb
+++ b/test/puppettest.rb
@@ -1,7 +1,7 @@
-libdir = File.join(File.dirname(__FILE__), '../lib')
-unless $:.include?(libdir)
- $:.unshift libdir
-end
+#libdir = File.join(File.dirname(__FILE__), '../lib')
+#unless $:.include?(libdir)
+# $:.unshift libdir
+#end
require 'puppet'
require 'test/unit'
@@ -1260,7 +1260,8 @@ class PuppetTestSuite
Dir.entries(self.basedir).find_all { |file|
path = File.join(@basedir, file)
# Data is for storing test data
- FileTest.directory?(path) and file !~ /^\./ and file != "data"
+ FileTest.directory?(path) and file !~ /^\./ and file != "data" and
+ file != "lib"
}
end