Merge pull request redhat-openstack#264 from apenney/fixes-for-tests

Fixes for PE3.3.
strider · Jun 3, 2014 · a364605 · a364605
1 parent fa45d59
commit a364605
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/spec/acceptance/fqdn_rotate_spec.rb b/spec/acceptance/fqdn_rotate_spec.rb
@@ -14,6 +14,7 @@
       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
@@ -26,7 +26,7 @@
       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
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ @@
           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
@@ Expand Down @@