summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2014-06-03 14:52:10 -0400
committerAshley Penney <ashley.penney@puppetlabs.com>2014-06-03 14:52:10 -0400
commit6010e9bd932560a61ffb5f955af1e3226fb8d934 (patch)
treef4534123bd1e9b87db1be74eb137e5dac7b940d9
parent43df782406a5948776b3eb487d7de07b6df040cc (diff)
downloadpuppet-stdlib-6010e9bd932560a61ffb5f955af1e3226fb8d934.tar.gz
puppet-stdlib-6010e9bd932560a61ffb5f955af1e3226fb8d934.tar.bz2
Further fixes to tests for 14.04.
-rwxr-xr-xspec/acceptance/ensure_packages_spec.rb2
-rwxr-xr-xspec/acceptance/shuffle_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/acceptance/ensure_packages_spec.rb b/spec/acceptance/ensure_packages_spec.rb
index 145bdc5..aa7b14c 100755
--- a/spec/acceptance/ensure_packages_spec.rb
+++ b/spec/acceptance/ensure_packages_spec.rb
@@ -11,7 +11,7 @@ describe 'ensure_packages function', :unless => UNSUPPORTED_PLATFORMS.include?(f
EOS
apply_manifest(pp, :expect_changes => true) do |r|
- expect(r.stdout).to match(/Package\[zsh\]\/ensure: created/)
+ expect(r.stdout).to match(/Package\[zsh\]\/ensure: (created|ensure changed 'purged' to 'present')/)
end
end
it 'ensures a package already declared'
diff --git a/spec/acceptance/shuffle_spec.rb b/spec/acceptance/shuffle_spec.rb
index 02d1201..b840d1f 100755
--- a/spec/acceptance/shuffle_spec.rb
+++ b/spec/acceptance/shuffle_spec.rb
@@ -5,14 +5,14 @@ describe 'shuffle function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('ope
describe 'success' do
it 'shuffles arrays' do
pp = <<-EOS
- $a = ["the","public","art","galleries"]
+ $a = ["1", "2", "3", "4", "5", "6", "7", "8", "the","public","art","galleries"]
# Anagram: Large picture halls, I bet
$o = shuffle($a)
notice(inline_template('shuffle is <%= @o.inspect %>'))
EOS
apply_manifest(pp, :catch_failures => true) do |r|
- expect(r.stdout).to_not match(/shuffle is \["the", "public", "art", "galleries"\]/)
+ expect(r.stdout).to_not match(/shuffle is \["1", "2", "3", "4", "5", "6", "7", "8", "the", "public", "art", "galleries"\]/)
end
end
it 'shuffles strings' do