Merge pull request redhat-openstack#101 from hunner/remove_stderr

Remove stderr checks because of deprecations

Author: Morgan Haskel

spec/acceptance/ini_setting_spec.rb

@@ -16,9 +16,9 @@
       shell("rm #{path}", :acceptable_exit_codes => [0,1,2])
     end
 
-    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("")
+    it 'applies the manifest twice' do
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
     describe file(path) do
@@ -67,9 +67,9 @@
       }
       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("")
+      it 'applies the manifest twice' do
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{tmpdir}/ini_setting.ini") do
@@ -96,9 +96,9 @@
       }
       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("")
+      it 'applies the manifest twice' do
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes  => true)
       end
 
       describe file("#{tmpdir}/ini_setting.ini") do
@@ -126,9 +126,9 @@
       }
       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("")
+      it 'applies the manifest twice' do
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes  => true)
       end
 
       describe file("#{tmpdir}/ini_setting.ini") do
@@ -158,9 +158,9 @@
       }
       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("")
+      it 'applies the manifest twice' do
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes  => true)
       end
 
       describe file("#{tmpdir}/ini_setting.ini") do

spec/acceptance/ini_subsetting_spec.rb

@@ -16,9 +16,9 @@
       shell("rm #{path}", :acceptable_exit_codes => [0,1,2])
     end
 
-    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("")
+    it 'applies the manifest twice' do
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes  => true)
     end
 
     describe file(path) do
@@ -66,9 +66,9 @@
       }
       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("")
+      it 'applies the manifest twice' do
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes  => true)
       end
 
       describe file("#{tmpdir}/ini_subsetting.ini") do
@@ -95,9 +95,9 @@
       }
       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("")
+      it 'applies the manifest twice' do
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes  => true)
       end
 
       describe file("#{tmpdir}/ini_subsetting.ini") do
@@ -176,9 +176,9 @@
         }
         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("")
+        it 'applies the manifest twice' do
+          apply_manifest(pp, :catch_failures => true)
+          apply_manifest(pp, :catch_changes  => true)
         end
 
         describe file("#{tmpdir}/ini_subsetting.ini") do