Stop checking for empty stderr

spec/acceptance/backup_spec.rb

@@ -23,7 +23,7 @@ describe 'concat backup parameter' do
         expect(r.stderr).to eq("")
         expect(r.stdout).to match(/Filebucketed \/tmp\/concat\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) # sum is for file contents of 'old contents'
       end
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do
@@ -52,8 +52,8 @@ describe 'concat backup parameter' do
     # XXX Puppet doesn't mention anything about filebucketing with a given
     # extension like .backup
     it 'applies the manifest twice  no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do
@@ -90,7 +90,7 @@ describe 'concat backup parameter' do
         expect(r.stderr).to eq("")
         expect(r.stdout).to_not match(/Filebucketed/)
       end
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do

spec/acceptance/concat_spec.rb

@@ -4,8 +4,8 @@ describe 'basic concat test' do
 
   shared_examples 'successfully_applied' do |pp|
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{default['puppetvardir']}/concat") do
@@ -192,8 +192,8 @@ describe 'basic concat test' do
       # Can't used shared examples as this will always trigger the exec when
       # absent is set.
       it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_failures => true)
       end
 
       describe file('/tmp/concat/file') do

spec/acceptance/deprecation_warnings_spec.rb

@@ -111,8 +111,8 @@ describe 'deprecation warnings' do
         EOS
 
         it 'applies the manifest twice with no stderr' do
-          expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-          expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+          apply_manifest(pp, :catch_failures => true)
+          apply_manifest(pp, :catch_changes => true)
         end
 
         describe file('/tmp/concat/file') do
@@ -149,8 +149,8 @@ describe 'deprecation warnings' do
         EOS
 
         it 'applies the manifest twice with no stderr' do
-          expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-          expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+          apply_manifest(pp, :catch_failures => true)
+          apply_manifest(pp, :catch_changes => true)
         end
 
         describe file('/tmp/concat/file') do

spec/acceptance/empty_spec.rb

@@ -12,8 +12,8 @@ describe 'concat force empty parameter' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do

spec/acceptance/fragment_source_spec.rb

@@ -25,8 +25,8 @@ describe 'concat::fragment source' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do
@@ -80,8 +80,8 @@ describe 'concat::fragment source' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
     describe file('/tmp/concat/result_file1') do
       it { should be_file }

spec/acceptance/fragments_are_always_replaced_spec.rb

@@ -25,10 +25,10 @@ describe 'concat::fragment replace' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp1, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp1, :catch_changes => true).stderr).to eq("")
-      expect(apply_manifest(pp2, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp2, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp1, :catch_failures => true)
+      apply_manifest(pp1, :catch_changes => true)
+      apply_manifest(pp2, :catch_failures => true)
+      apply_manifest(pp2, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do
@@ -64,10 +64,10 @@ describe 'concat::fragment replace' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp1, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp1, :catch_changes => true).stderr).to eq("")
-      expect(apply_manifest(pp2, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp2, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp1, :catch_failures => true)
+      apply_manifest(pp1, :catch_changes => true)
+      apply_manifest(pp2, :catch_failures => true)
+      apply_manifest(pp2, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do
@@ -103,10 +103,10 @@ describe 'concat::fragment replace' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp1, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp1, :catch_changes => true).stderr).to eq("")
-      expect(apply_manifest(pp2, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp2, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp1, :catch_failures => true)
+      apply_manifest(pp1, :catch_changes => true)
+      apply_manifest(pp2, :catch_failures => true)
+      apply_manifest(pp2, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do

spec/acceptance/newline_spec.rb

@@ -17,8 +17,8 @@ describe 'concat ensure_newline parameter' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do
@@ -43,8 +43,8 @@ describe 'concat ensure_newline parameter' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes  => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes  => true)
       #XXX ensure_newline => true causes changes on every run because the files
       #are modified in place.
     end

spec/acceptance/order_spec.rb

@@ -26,8 +26,8 @@ describe 'concat order' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do
@@ -56,8 +56,8 @@ describe 'concat order' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do
@@ -94,8 +94,8 @@ describe 'concat::fragment order' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do
@@ -125,8 +125,8 @@ describe 'concat::fragment order' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/foo') do

spec/acceptance/quoted_paths_spec.rb

@@ -21,8 +21,8 @@ describe 'quoted paths' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat test/foo') do

spec/acceptance/replace_spec.rb

@@ -28,8 +28,8 @@ describe 'replacement of' do
       EOS
 
       it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
       end
 
       describe file('/tmp/concat/file') do
@@ -66,8 +66,8 @@ describe 'replacement of' do
       EOS
 
       it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
       end
 
       describe file('/tmp/concat/file') do
@@ -109,8 +109,8 @@ describe 'replacement of' do
       EOS
 
       it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
       end
 
       describe file('/tmp/concat/file') do
@@ -153,8 +153,8 @@ describe 'replacement of' do
       EOS
 
       it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
       end
 
       describe file('/tmp/concat/file') do
@@ -228,8 +228,8 @@ describe 'replacement of' do
       EOS
 
       it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
       end
 
       describe file('/tmp/concat/file') do

spec/acceptance/symbolic_name_spec.rb

@@ -20,8 +20,8 @@ describe 'symbolic name' do
   EOS
 
   it 'applies the manifest twice with no stderr' do
-    expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-    expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+    apply_manifest(pp, :catch_failures => true)
+    apply_manifest(pp, :catch_changes => true)
   end
 
   describe file('/tmp/concat/file') do

spec/acceptance/warn_spec.rb

@@ -21,8 +21,8 @@ describe 'concat warn =>' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do
@@ -52,8 +52,8 @@ describe 'concat warn =>' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do
@@ -83,8 +83,8 @@ describe 'concat warn =>' do
     EOS
 
     it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file('/tmp/concat/file') do