summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-07-16 22:00:38 -0500
committerJames Turnbull <james@lovedthanlost.net>2008-07-17 13:08:33 +1000
commit7fa7251e30dfefc95dda6ef82181d4346f36880d (patch)
tree38850331af675c3ab7cde7c19e2e226471311f60 /test
parentbdbd992a6f5ff9628682179639923214d09a780c (diff)
downloadpuppet-7fa7251e30dfefc95dda6ef82181d4346f36880d.tar.gz
puppet-7fa7251e30dfefc95dda6ef82181d4346f36880d.tar.xz
puppet-7fa7251e30dfefc95dda6ef82181d4346f36880d.zip
The mongrel-related tests now run without mongrel.
Here were the main changes necessary: * Fixed the class loader so it only loads mongrel if it's available. * Fixed the test runner to skip example groups contained in non-runnable example groups. * Fixed the Mongrel tests to use quoted class names instead of constants, since the constants themselves would be absent. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'test')
-rw-r--r--test/lib/puppettest/runnable_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/lib/puppettest/runnable_test.rb b/test/lib/puppettest/runnable_test.rb
index e4b0f9033..e3cde5052 100644
--- a/test/lib/puppettest/runnable_test.rb
+++ b/test/lib/puppettest/runnable_test.rb
@@ -15,6 +15,9 @@ module PuppetTest
# Evaluate all of our tests to see if any of them are false
# and thus whether this test is considered not runnable.
def runnable?
+ if superclass.respond_to?(:runnable?) and ! superclass.runnable?
+ return false
+ end
@messages ||= []
return false unless @messages.empty?
return true unless defined? @confines