summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-06-03 11:13:35 -0400
committerMorgan Haskel <morgan@puppetlabs.com>2014-06-03 11:13:35 -0400
commit43df782406a5948776b3eb487d7de07b6df040cc (patch)
tree4ccf674b526bde1ce72b9e781f84fad6920c4bf3 /spec
parent0cda8587440f2a9c1d5af174f3fd21ed72fa3ca2 (diff)
parent08f7553fb66621fb816400609a034582c44c91e4 (diff)
Merge pull request #264 from apenney/fixes-for-tests
Fixes for PE3.3.
Diffstat (limited to 'spec')
-rwxr-xr-xspec/acceptance/fqdn_rotate_spec.rb1
-rwxr-xr-xspec/acceptance/parseyaml_spec.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/acceptance/fqdn_rotate_spec.rb b/spec/acceptance/fqdn_rotate_spec.rb
index b7f8bf8..fc8bea2 100755
--- a/spec/acceptance/fqdn_rotate_spec.rb
+++ b/spec/acceptance/fqdn_rotate_spec.rb
@@ -14,6 +14,7 @@ describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact(
shell("if [ -f #{facts_d}/fqdn.txt ] ; then rm #{facts_d}/fqdn.txt ; fi")
end
it 'fqdn_rotates floats' do
+ shell("mkdir -p #{facts_d}")
shell("echo 'fqdn=fakehost.localdomain' > #{facts_d}/fqdn.txt")
pp = <<-EOS
$a = ['a','b','c','d']
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