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/values_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/values_spec.rb')
| -rwxr-xr-x | spec/acceptance/values_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/acceptance/values_spec.rb b/spec/acceptance/values_spec.rb index 7ef956e..a2eff32 100755 --- a/spec/acceptance/values_spec.rb +++ b/spec/acceptance/values_spec.rb @@ -13,8 +13,12 @@ describe 'values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('oper $output = values($arg) notice(inline_template('<%= @output.sort.inspect %>')) EOS + if is_future_parser_enabled? + expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[1, 2, 3\]/) + else + expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "2", "3"\]/) + end - expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "2", "3"\]/) end end describe 'failure' do |