Fix more issues parsing Salt Master pillar data

testsuite/features/step_definitions/salt_steps.rb

@@ -396,23 +396,13 @@
 end
 
 Then(/^the pillar data for "([^"]*)" should be empty on the Salt Master$/) do |key|
-  output = ''
-  repeat_until_timeout(timeout: DEFAULT_TIMEOUT, message: "Output has more than one line: #{output}", report_result: true) do
-    output, _code = salt_master_pillar_get(key)
-    break if output.split("\n").length == 1
-
-    sleep 1
-  end
+  output = salt_master_pillar_get(key)
+  raise "Output value is not empty: #{output}" unless output == ''
 end
 
 Then(/^the pillar data for "([^"]*)" should be "([^"]*)" on the Salt Master$/) do |key, value|
-  output, _code = salt_master_pillar_get(key)
-  if value == ''
-    raise "Output has more than one line: #{output}" unless output.split("\n").length == 1
-  else
-    raise "Output value wasn't found: #{output}" unless output.split("\n").length > 1
-    raise "Output value is different than #{value}: #{output}" unless output.split("\n")[1].strip == value
-  end
+  output = salt_master_pillar_get(key)
+  raise "Output value is different than #{value}: #{output}" unless output == value
 end
 
 Given(/^I try to download "([^"]*)" from channel "([^"]*)"$/) do |rpm, channel|

testsuite/features/support/commonlib.rb

@@ -698,7 +698,7 @@ def pillar_get(key, minion)
 def salt_master_pillar_get(key)
   output, _code = get_target('server').run("salt-run salt.cmd pillar.items #{key}")
   pillars = YAML.load(output)
-  pillars[key] || ''
+  pillars.key?(key) ? pillars[key] : ''
 end
 
 # Wait for an action to be completed, passing the action id and a timeout