diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-06-28 19:33:11 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-06-28 19:33:11 -0700 |
| commit | 6651b28d64d59eff6af0bb9722e151e4da88979e (patch) | |
| tree | 418747ed81c9b1625617dee91e58a0bd110ec0e2 | |
| parent | 8772bb7659a8586402802ce80d43fa249a4d6171 (diff) | |
| parent | 902c4147a2100c1f71d8493c526ae5275bab4cdc (diff) | |
| download | puppet-6651b28d64d59eff6af0bb9722e151e4da88979e.tar.gz puppet-6651b28d64d59eff6af0bb9722e151e4da88979e.tar.xz puppet-6651b28d64d59eff6af0bb9722e151e4da88979e.zip | |
Merge branch '2.7.x'
* 2.7.x:
Update configurer_spec.rb to work with Ruby 1.8.5
| -rwxr-xr-x | spec/unit/configurer_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/configurer_spec.rb b/spec/unit/configurer_spec.rb index f8a486928..020d1850f 100755 --- a/spec/unit/configurer_spec.rb +++ b/spec/unit/configurer_spec.rb @@ -244,7 +244,7 @@ describe Puppet::Configurer do Puppet.settings[:prerun_command] = "/my/command" Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed") - report.expects(:<<).with { |log| log.message.start_with?("Could not run command from prerun_command") } + report.expects(:<<).with { |log| log.message =~ /^Could not run command from prerun_command/ } @agent.run.should be_nil end @@ -267,7 +267,7 @@ describe Puppet::Configurer do Puppet.settings[:postrun_command] = "/my/command" Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed") - report.expects(:<<).with { |log| log.message.start_with?("Could not run command from postrun_command") } + report.expects(:<<).with { |log| log.message =~ /^Could not run command from postrun_command/ } @agent.run.should be_nil end |