diff options
| author | Luke Kanies <luke@madstop.com> | 2008-12-09 15:10:09 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-12-09 15:10:09 -0600 |
| commit | 71b8befa424c6c82a10a5cc7d7ea50331851c7e9 (patch) | |
| tree | 0143dc9e61dba7b54ec0b44399b6c9d20ae32767 /test | |
| parent | 89e9ef7521f5d62f1eb65514fe8923d0456e6184 (diff) | |
| parent | e5c36fd865a5699c867e68a23153ec40da919e33 (diff) | |
| download | puppet-71b8befa424c6c82a10a5cc7d7ea50331851c7e9.tar.gz puppet-71b8befa424c6c82a10a5cc7d7ea50331851c7e9.tar.xz puppet-71b8befa424c6c82a10a5cc7d7ea50331851c7e9.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
lib/puppet/type/tidy.rb
spec/unit/type/file/ensure.rb
spec/unit/type/tidy.rb
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/puppettest/runnable_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lib/puppettest/runnable_test.rb b/test/lib/puppettest/runnable_test.rb index 6dab1b743..977dba47a 100644 --- a/test/lib/puppettest/runnable_test.rb +++ b/test/lib/puppettest/runnable_test.rb @@ -17,10 +17,10 @@ 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? + @messages ||= [] if superclass.respond_to?(:runnable?) and ! superclass.runnable? return false end - @messages ||= [] return false unless @messages.empty? return true unless defined? @confines @confines.find_all do |message, result| |