Merge branch '2.6.x' into 2.7.x

* 2.6.x:
  Confine password disclosure acceptance test to hosts with required libraries

1 files changed, 13 insertions, 3 deletions

diff --git a/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb b/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb
index f1e100c2e..d3b415691 100644
--- a/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb
+++ b/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb
@@ -1,5 +1,15 @@
 test_name "#6857: redact password hashes when applying in noop mode"
 
+hosts_to_test = agents.reject do |agent|
+  if agent['platform'].match /(?:ubuntu|centos|debian|rhel)/
+    result = on(agent, %q{ruby -e 'require "shadow" or raise'}, :silent => true)
+    result.exit_code != 0
+  else
+    false
+  end
+end
+skip_test "No suitable hosts found" if hosts_to_test.empty?
+
 adduser_manifest = <<MANIFEST
 user { 'passwordtestuser':
   ensure   => 'present',
@@ -15,9 +25,9 @@ user { 'passwordtestuser':
 }
 MANIFEST
 
-apply_manifest_on(agents, adduser_manifest )
-results = apply_manifest_on(agents, changepass_manifest )
+apply_manifest_on(hosts_to_test, adduser_manifest )
+results = apply_manifest_on(hosts_to_test, changepass_manifest )
 
 results.each do |result|
-  assert_match( /current_value \[old password hash redacted\], should be \[new password hash redacted\]/ , "#{result.stdout}" )
+  assert_match( /current_value \[old password hash redacted\], should be \[new password hash redacted\]/ , "#{result.host}: #{result.stdout}" )
 end