Merge pull request #8563 from luchihoratiu/maint-puppet_fact_diff

(maint) Retrieve only stdout for `puppet facts diff`

Author: mihaibuzgau

lib/puppet/face/facts.rb

@@ -141,8 +141,8 @@
           puppet_show_cmd = "ruby -S -- #{puppet_show_cmd}"
         end
 
-        facter_3_result = Puppet::Util::Execution.execute("#{puppet_show_cmd} --no-facterng #{cmd_flags}")
-        facter_ng_result = Puppet::Util::Execution.execute("#{puppet_show_cmd} --facterng #{cmd_flags}")
+        facter_3_result = Puppet::Util::Execution.execute("#{puppet_show_cmd} --no-facterng #{cmd_flags}", combine: false)
+        facter_ng_result = Puppet::Util::Execution.execute("#{puppet_show_cmd} --facterng #{cmd_flags}", combine: false)
 
         exclude_list = options[:exclude].nil? ? EXCLUDE_LIST : EXCLUDE_LIST + [ options[:exclude] ]
         fact_diff = FactDif.new(facter_3_result, facter_ng_result, exclude_list, options[:structured])

spec/unit/application/facts_spec.rb

@@ -191,8 +191,8 @@
       app.command_line.args = %w{diff}
 
       allow(Facter).to receive(:value).with('facterversion').and_return('3.99.0')
-      allow(Puppet::Util::Execution).to receive(:execute).with(/puppet facts show --no-facterng/).and_return(facter3_facts)
-      allow(Puppet::Util::Execution).to receive(:execute).with(/puppet facts show --facterng/).and_return(facter4_facts)
+      allow(Puppet::Util::Execution).to receive(:execute).with(/puppet facts show --no-facterng/, combine:false).and_return(facter3_facts)
+      allow(Puppet::Util::Execution).to receive(:execute).with(/puppet facts show --facterng/, combine:false).and_return(facter4_facts)
     end
 
     # Workaround for YAML issue on Ubuntu where null values get space as key