diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2014-06-03 11:13:35 -0400 |
---|---|---|
committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-06-03 11:15:20 -0400 |
commit | a364605f3b71b8a0857bbc2c47388f7bb9e11f82 (patch) | |
tree | e42d6d1a70d50ca4827b4bafbb57ba62aeedd513 /spec/acceptance/parseyaml_spec.rb | |
parent | fa45d594ade2f460ec59b35932d04cbca0ee1a84 (diff) | |
download | puppet-stdlib-a364605f3b71b8a0857bbc2c47388f7bb9e11f82.tar.gz puppet-stdlib-a364605f3b71b8a0857bbc2c47388f7bb9e11f82.tar.bz2 |
Merge pull request #264 from apenney/fixes-for-tests
Fixes for PE3.3.
Diffstat (limited to 'spec/acceptance/parseyaml_spec.rb')
-rwxr-xr-x | spec/acceptance/parseyaml_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/acceptance/parseyaml_spec.rb b/spec/acceptance/parseyaml_spec.rb index 4b4bf3d..5819837 100755 --- a/spec/acceptance/parseyaml_spec.rb +++ b/spec/acceptance/parseyaml_spec.rb @@ -26,7 +26,7 @@ describe 'parseyaml function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('o EOS apply_manifest(pp, :expect_failures => true) do |r| - expect(r.stderr).to match(/syntax error/) + expect(r.stderr).to match(/(syntax error|did not find expected key)/) end end |