diff options
| author | Travis Fields <travis@puppetlabs.com> | 2014-10-28 15:31:37 -0700 |
|---|---|---|
| committer | Travis Fields <travis@puppetlabs.com> | 2014-10-28 15:31:37 -0700 |
| commit | a6f3f781d195c6fc0b263fc4eb46ef274d360627 (patch) | |
| tree | ab68f0ce8128817feb77c8b393809e01bad73ff7 /spec/acceptance/merge_spec.rb | |
| parent | 9dea09297956f6f7ac0a75e83e9f3e2e5681432c (diff) | |
| parent | cfc79e9831fb530b4a34bb79db119969b3a166b3 (diff) | |
| download | puppet-stdlib-a6f3f781d195c6fc0b263fc4eb46ef274d360627.tar.gz puppet-stdlib-a6f3f781d195c6fc0b263fc4eb46ef274d360627.tar.bz2 | |
Merge remote-tracking branch 'origin/4.3.x' back to master
Diffstat (limited to 'spec/acceptance/merge_spec.rb')
| -rwxr-xr-x | spec/acceptance/merge_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/acceptance/merge_spec.rb b/spec/acceptance/merge_spec.rb index a60e784..227b994 100755 --- a/spec/acceptance/merge_spec.rb +++ b/spec/acceptance/merge_spec.rb @@ -14,9 +14,9 @@ describe 'merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('opera EOS apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/merge\[one\] is "1"/) + expect(r.stdout).to match(/merge\[one\] is ("1"|1)/) expect(r.stdout).to match(/merge\[two\] is "dos"/) - expect(r.stdout).to match(/merge\[three\] is {"five"=>"5"}/) + expect(r.stdout).to match(/merge\[three\] is {"five"=>("5"|5)}/) end end end |