summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-09-08 17:33:48 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-09-08 17:33:48 -0700
commitf62095749a14fd67987df5cf2e3e9138b71efd19 (patch)
treea3993f28f3ed1026507c22cc1b157b848c8fcc83
parent4bda0b53c7b30814a2c8f97455c9362b1de67f2a (diff)
parent1ba536eb533e99d0f400178184ce929f18457b03 (diff)
downloadpuppet-f62095749a14fd67987df5cf2e3e9138b71efd19.tar.gz
puppet-f62095749a14fd67987df5cf2e3e9138b71efd19.tar.xz
puppet-f62095749a14fd67987df5cf2e3e9138b71efd19.zip
Merge remote branch 'paul/ticket/next/3782' into next
-rwxr-xr-xtest/ral/providers/cron/crontab.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb
index 0c87a5bba..be2af1e16 100755
--- a/test/ral/providers/cron/crontab.rb
+++ b/test/ral/providers/cron/crontab.rb
@@ -97,7 +97,10 @@ class TestCronParsedProvider < Test::Unit::TestCase
# Then do them all at once.
records = []
text = ""
- sample_records.each do |name, options|
+ # Sort sample_records so that the :empty entry does not come last
+ # (if it does, the test will fail because the empty last line will
+ # be ignored)
+ sample_records.sort { |a, b| a.first.to_s <=> b.first.to_s }.each do |name, options|
records << options[:record]
text += options[:text] + "\n"
end