Merge pull request #7420 from melissa/ticket/5.5.x/PUP-9076-take-2

(PUP-9076) Puppet should fail when it cannot find a functional server

Author: jhelwig

acceptance/tests/reports/failover_master.rb

@@ -37,9 +37,8 @@ def remove_reports_on_master(master_reportdir, agent_node_name)
         end
 
         step "master_field should not appear when no master could be conatacted" do
-          on(agent, puppet("agent", "-t", "--config #{tmpconf}", "--server_list=badmaster:1","--http_connect_timeout=5s", "--report_server=#{master}"), :acceptable_exit_codes => [1])
-          on(master, "cat #{master_reportdir}/#{agent.node_name}/*") do
-            assert_no_match(/master_used:/, stdout, "did not expect master_used to be in the report")
+          on(agent, puppet("agent", "-t", "--config #{tmpconf}", "--server_list=badmaster:1","--http_connect_timeout=5s", "--report_server=#{master}"), :acceptable_exit_codes => [1]) do
+            assert_match(/Could not select a functional puppet master from server_list:/, stderr)
           end
           remove_reports_on_master(master_reportdir, agent.node_name)
         end