(maint) Merge up db67fb3 to master

Generated by CI

* commit 'db67fb3badc383cd9a20f62a53ff3cfdce3953c2':
  (packaging) Updating manpage file for 5.5.x
  (maint) fix resource assertions

Conflicts:
	man/man8/puppet-ca.8
	man/man8/puppet-cert.8
	man/man8/puppet-certificate.8
	man/man8/puppet-certificate_request.8
	man/man8/puppet-certificate_revocation_list.8
	man/man8/puppet-master.8

Author: puppetlabs-jenkins

acceptance/lib/puppet/acceptance/service_utils.rb

@@ -83,8 +83,8 @@ def ensure_service_on_host(host, service, status, &block)
       # @param block [Proc] optional: block to verify service state
       # @return None
       def assert_service_status_on_host(host, service, status, &block)
-        ensure_status = "ensure => '#{status[:ensure]}'" if status[:ensure]
-        enable_status = "enable => '#{status[:enable]}'" if status[:enable]
+        ensure_status = "ensure.+=> '#{status[:ensure]}'" if status[:ensure]
+        enable_status = "enable.+=> '#{status[:enable]}'" if status[:enable]
 
         on host, puppet_resource('service', service) do
           assert_match(/'#{service}'.+#{ensure_status}.+#{enable_status}/m, stdout, "Service status does not match expectation #{status}")

acceptance/tests/resource/service/launchd_provider.rb

@@ -84,15 +84,15 @@ def launchctl_assert_status(host, service, expect_running)
   step "Start the service on #{agent} when service is stopped, and check outoput" do
     on agent, puppet_resource('service', svc, 'ensure=stopped')
     on agent, puppet_resource('service', svc, 'ensure=running') do |result|
-      assert_match(/service { '#{svc}':\n  ensure => 'running',\n}$/, stdout, 'Service status change failed')
+      assert_match(/service { '#{svc}':\n  ensure.+=> 'running',\n}$/, stdout, 'Service status change failed')
     end
   end
 
    # switching from running to stopped should output the correct status of the service and not 'absent'
   step "Start the service on #{agent} when service is running, and check outoput" do
     on agent, puppet_resource('service', svc, 'ensure=running')
     on agent, puppet_resource('service', svc, 'ensure=stopped') do |result|
-      assert_match(/service { '#{svc}':\n  ensure => 'stopped',\n}$/, stdout, 'Service status change failed')
+      assert_match(/service { '#{svc}':\n  ensure.+=> 'stopped',\n}$/, stdout, 'Service status change failed')
     end
   end
 

acceptance/tests/resource/service/smf_basic_tests.rb

@@ -45,7 +45,7 @@
 
     step "SMF: ensure you can query the service with the ral" do
       on(agent, puppet("resource service tstapp")) do
-        assert_match( /ensure => 'running'/, result.stdout, "err: #{agent}")
+        assert_match( /ensure.+=> 'running'/, result.stdout, "err: #{agent}")
       end
     end
 

acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb

@@ -78,8 +78,8 @@
   step "Masking the #{package_name[platform]} service"
   apply_manifest_on(agent, manifest_service_masked, :catch_failures => true)
   on(agent, puppet_resource('service', package_name[platform])) do
-    assert_match(/ensure => 'stopped'/, stdout, "Expected #{package_name[platform]} service to be stopped")
-    assert_match(/enable => 'false'/, stdout, "Expected #{package_name[platform]} service to be masked")
+    assert_match(/ensure.+=> 'stopped'/, stdout, "Expected #{package_name[platform]} service to be stopped")
+    assert_match(/enable.+=> 'false'/, stdout, "Expected #{package_name[platform]} service to be masked")
     on(agent, "readlink #{masked_symlink_systemd}") do
       assert_equal('/dev/null', stdout.chomp, "Expected service symlink to point to /dev/null")
     end
@@ -88,8 +88,8 @@
   step "Enabling the #{package_name[platform]} service"
   apply_manifest_on(agent, manifest_service_enabled, :catch_failures => true)
   on(agent, puppet_resource('service', package_name[platform])) do
-    assert_match(/ensure => 'running'/, stdout, "Expected #{package_name[platform]} service to be running")
-    assert_match(/enable => 'true'/, stdout, "Expected #{package_name[platform]} service to be enabled")
+    assert_match(/ensure.+=> 'running'/, stdout, "Expected #{package_name[platform]} service to be running")
+    assert_match(/enable.+=> 'true'/, stdout, "Expected #{package_name[platform]} service to be enabled")
     on(agent, "readlink #{symlink_systemd}") do
       assert_equal(init_script_systemd, stdout.chomp, "Expected service symlink to point to systemd init script")
     end