Allow tests to pass in puppet 3.8 and 4.5

Author: Kevin Paulisse

spec/octocatalog-diff/integration/reference_validation_spec.rb

@@ -102,13 +102,14 @@ def self.catalog_contains_resource(result, type, title)
       expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Errors::ReferenceValidationError)
     end
 
+    # Multiple line numbers given because Puppet 4.x and 3.8 correspond to first and last line of resource, respectively.
     # rubocop:disable Metrics/LineLength
     it 'should have formatted error messages' do
       msg = @result.exception.message
-      expect(msg).to match(%r{exec\[subscribe caller 1\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:2\) -> subscribe\[Exec\[subscribe target\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 2\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:7\) -> subscribe\[Exec\[subscribe target\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 2\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:7\) -> subscribe\[Exec\[subscribe target 2\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 3\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:15\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 1\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:(2|5)\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 2\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:(7|13)\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 2\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:(7|13)\) -> subscribe\[Exec\[subscribe target 2\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 3\]\(/environments/production/modules/test/manifests/subscribe_callers.pp:(15|21)\) -> subscribe\[Exec\[subscribe target\]\]})
       expect(msg).not_to match(/exec\[subscribe caller 3\].+subscribe\[Exec\[subscribe caller 1\]\]/)
     end
     # rubocop:enable Metrics/LineLength
@@ -130,7 +131,7 @@ def self.catalog_contains_resource(result, type, title)
     # rubocop:disable Metrics/LineLength
     it 'should have formatted error messages' do
       msg = @result.exception.message
-      expect(msg).to eq('Catalog has broken reference: exec[before caller](/environments/production/modules/test/manifests/before_callers.pp:2) -> before[Exec[before target]]')
+      expect(msg).to match(%r{Catalog has broken reference: exec\[before caller\]\(/environments/production/modules/test/manifests/before_callers.pp:(2|5)\) -> before\[Exec\[before target\]\]})
     end
     # rubocop:enable Metrics/LineLength
   end
@@ -151,7 +152,7 @@ def self.catalog_contains_resource(result, type, title)
     # rubocop:disable Metrics/LineLength
     it 'should have formatted error messages' do
       msg = @result.exception.message
-      expect(msg).to match(%r{exec\[notify caller\]\(/environments/production/modules/test/manifests/notify_callers.pp:2\) -> notify\[Test::Foo::Bar\[notify target\]\]})
+      expect(msg).to match(%r{exec\[notify caller\]\(/environments/production/modules/test/manifests/notify_callers.pp:(2|4)\) -> notify\[Test::Foo::Bar\[notify target\]\]})
     end
     # rubocop:enable Metrics/LineLength
   end
@@ -172,9 +173,9 @@ def self.catalog_contains_resource(result, type, title)
     # rubocop:disable Metrics/LineLength
     it 'should have formatted error messages' do
       msg = @result.exception.message
-      expect(msg).to match(%r{exec\[require caller\]\(/environments/production/modules/test/manifests/require_callers.pp:2\) -> require\[Exec\[require target\]\]})
-      expect(msg).to match(%r{exec\[require caller 3\]\(/environments/production/modules/test/manifests/require_callers.pp:12\) -> require\[Exec\[require target\]\]})
-      expect(msg).to match(%r{exec\[require caller 4\]\(/environments/production/modules/test/manifests/require_callers.pp:12\) -> require\[Exec\[require target\]\]})
+      expect(msg).to match(%r{exec\[require caller\]\(/environments/production/modules/test/manifests/require_callers.pp:(2|5)\) -> require\[Exec\[require target\]\]})
+      expect(msg).to match(%r{exec\[require caller 3\]\(/environments/production/modules/test/manifests/require_callers.pp:(12|18)\) -> require\[Exec\[require target\]\]})
+      expect(msg).to match(%r{exec\[require caller 4\]\(/environments/production/modules/test/manifests/require_callers.pp:(12|18)\) -> require\[Exec\[require target\]\]})
       expect(msg).not_to match(/exec\[require caller 2\]/)
       expect(msg).not_to match(/-> require\[Exec\[require caller\]\]/)
     end
@@ -234,10 +235,10 @@ def self.catalog_contains_resource(result, type, title)
     # rubocop:disable Metrics/LineLength
     it 'should have formatted error messages' do
       msg = @result.exception.message
-      expect(msg).to match(%r{exec\[before alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:2\) -> before\[Exec\[before alias target\]\]})
-      expect(msg).to match(%r{exec\[notify alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:7\) -> before\[Exec\[notify alias target\]\]})
-      expect(msg).to match(%r{exec\[require alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:12\) -> before\[Exec\[require alias target\]\]})
-      expect(msg).to match(%r{exec\[subscribe alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:17\) -> before\[Exec\[subscribe alias target\]\]})
+      expect(msg).to match(%r{exec\[before alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:(2|5)\) -> before\[Exec\[before alias target\]\]})
+      expect(msg).to match(%r{exec\[notify alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:(7|10)\) -> before\[Exec\[notify alias target\]\]})
+      expect(msg).to match(%r{exec\[require alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:(12|15)\) -> before\[Exec\[require alias target\]\]})
+      expect(msg).to match(%r{exec\[subscribe alias caller\]\(/environments/production/modules/test/manifests/alias_callers.pp:(17|20)\) -> before\[Exec\[subscribe alias target\]\]})
     end
     # rubocop:enable Metrics/LineLength
   end
@@ -290,10 +291,10 @@ def self.catalog_contains_resource(result, type, title)
     # rubocop:disable Metrics/LineLength
     it 'should have formatted error messages' do
       msg = @result.exception.message
-      expect(msg).to match(%r{exec\[subscribe caller 1\]\(.+/modules/test/manifests/subscribe_callers.pp:2\) -> subscribe\[Exec\[subscribe target\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:7\) -> subscribe\[Exec\[subscribe target\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:7\) -> subscribe\[Exec\[subscribe target 2\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 3\]\(.+/modules/test/manifests/subscribe_callers.pp:15\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 1\]\(.+/modules/test/manifests/subscribe_callers.pp:(2|5)\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:(7|13)\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:(7|13)\) -> subscribe\[Exec\[subscribe target 2\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 3\]\(.+/modules/test/manifests/subscribe_callers.pp:(15|21)\) -> subscribe\[Exec\[subscribe target\]\]})
     end
     # rubocop:enable Metrics/LineLength
   end
@@ -336,10 +337,10 @@ def self.catalog_contains_resource(result, type, title)
     # rubocop:disable Metrics/LineLength
     it 'should have formatted error messages from to-catalog only' do
       msg = @result.exception.message
-      expect(msg).to match(%r{exec\[subscribe caller 1\]\(.+/modules/test/manifests/subscribe_callers.pp:2\) -> subscribe\[Exec\[subscribe target\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:7\) -> subscribe\[Exec\[subscribe target\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:7\) -> subscribe\[Exec\[subscribe target 2\]\]})
-      expect(msg).to match(%r{exec\[subscribe caller 3\]\(.+/modules/test/manifests/subscribe_callers.pp:15\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 1\]\(.+/modules/test/manifests/subscribe_callers.pp:(2|5)\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:(7|13)\) -> subscribe\[Exec\[subscribe target\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 2\]\(.+/modules/test/manifests/subscribe_callers.pp:(7|13)\) -> subscribe\[Exec\[subscribe target 2\]\]})
+      expect(msg).to match(%r{exec\[subscribe caller 3\]\(.+/modules/test/manifests/subscribe_callers.pp:(15|21)\) -> subscribe\[Exec\[subscribe target\]\]})
       expect(msg).not_to match(/require target/)
     end
     # rubocop:enable Metrics/LineLength