Description: Ensure the specs work with puppet 5
 The output of puppet 5 slightly changed. Accordingly, this patch fixes
 the expected output if running the specs.
Author: Georg Faerber <georg@riseup.net>
Forwarded: not yet
Last-Update: 2018-03-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/spec/puppet-syntax/manifests_spec.rb
+++ b/spec/puppet-syntax/manifests_spec.rb
@@ -74,8 +74,8 @@
     expect(has_errors).to eq(true)
     if Puppet.version.to_i >= 4
       expect(output.size).to eq(5)
-      expect(output[0]).to match(/This Name has no effect. A Host Class Definition can not end with a value-producing expression without other effect at \S*\/fail_error.pp:2:32$/)
-      expect(output[1]).to match(/This Name has no effect. A value(-producing expression without other effect may only be placed last in a block\/sequence| was produced and then forgotten.*) at \S*\/fail_error.pp:2:3$/)
+      expect(output[0]).to match(/This Name has no effect. A Host Class Definition can not end with a value-producing expression without other effect \(file: \S*\/fail_error.pp, line: 2, column: 32\)$/)
+      expect(output[1]).to match(/This Name has no effect. A value was produced and then forgotten \(one or more preceding expressions may have the wrong form\) \(file: \S*\/fail_error.pp, line: 2, column: 3\)$/)
       expect(output[2]).to match('2 errors. Giving up')
       expect(output[3]).to match(/Unrecogni(s|z)ed escape sequence '\\\['/)
       expect(output[4]).to match(/Unrecogni(s|z)ed escape sequence '\\\]'/)
--- a/spec/puppet-syntax/templates_spec.rb
+++ b/spec/puppet-syntax/templates_spec.rb
@@ -117,7 +117,7 @@
 
         expect(res.size).to eq(2)
         expect(res[0]).to match(/This Type-Name has no effect/)
-        expect(res[1]).to match(/Syntax error at '}' at \S*\/fail_error_also.epp:2:4/)
+        expect(res[1]).to match(/Syntax error at '}' \(file: \S*\/fail_error_also.epp, line: 2, column: 4\)/)
       end
 
       context "when the 'epp_only' options is set" do
