Merge pull request puppetlabs#5974 from camlow325/maint/master/PUP-76…

…52-allow-quotes-around-catalog-uuid-value-in-report-yaml (PUP-7652) Allow quotes in report yaml uuid value for catalog_uuid test
Iristyle · Jun 13, 2017 · 27fdad2 · 27fdad2
2 parents f0dc3c6 + a5fe046
commit 27fdad2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/acceptance/tests/direct_puppet/catalog_uuid_correlates_catalogs_with_reports.rb b/acceptance/tests/direct_puppet/catalog_uuid_correlates_catalogs_with_reports.rb
@@ -16,7 +16,7 @@ def get_catalog_uuid_from_cached_catalog(host, agent_vardir, agent_node_name)
   def get_catalog_uuid_from_report(master_reportdir, agent_node_name)
     report_catalog_uuid = nil
     on(master, "cat #{master_reportdir}/#{agent_node_name}/*") do
-      report_catalog_uuid = stdout.match(/catalog_uuid: ([a-z0-9\-]*)/)[1]
+      report_catalog_uuid = stdout.match(/catalog_uuid: '?([a-z0-9\-]*)'?/)[1]
     end
     report_catalog_uuid
   end