From cf9fa00c08f0705fa16f9a3e0e28ac9c795c1986 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Mon, 2 Jun 2014 16:10:57 -0700
Subject: [PATCH] Update tests to ignore warnings but still look for errors

---
 spec/acceptance/class_spec.rb             | 9 +++++----
 spec/acceptance/ntp_parameters_spec.rb    | 2 +-
 spec/acceptance/preferred_servers_spec.rb | 2 +-
 spec/acceptance/restrict_spec.rb          | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index e61f9db5..41f5b711 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -6,10 +6,11 @@
 
     # Apply twice to ensure no errors the second time.
     apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
+      expect(r.stderr).not_to match(/error/i)
     end
     apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
+      expect(r.stderr).not_to eq(/error/i)
+
       expect(r.exit_code).to be_zero
     end
   end
@@ -19,7 +20,7 @@
       pp = "class { 'ntp': service_ensure => stopped }"
 
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
+        expect(r.stderr).not_to match(/error/i)
       end
     end
   end
@@ -29,7 +30,7 @@
       pp = "class { 'ntp': service_ensure => running }"
 
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
+        expect(r.stderr).not_to match(/error/i)
       end
     end
   end
diff --git a/spec/acceptance/ntp_parameters_spec.rb b/spec/acceptance/ntp_parameters_spec.rb
index 71a6b202..48e6cfdf 100644
--- a/spec/acceptance/ntp_parameters_spec.rb
+++ b/spec/acceptance/ntp_parameters_spec.rb
@@ -23,7 +23,7 @@
     pp = "class { 'ntp': }"
 
     apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
+      expect(r.stderr).not_to match(/error/i)
     end
   end
 
diff --git a/spec/acceptance/preferred_servers_spec.rb b/spec/acceptance/preferred_servers_spec.rb
index 7994aced..8db82ec3 100644
--- a/spec/acceptance/preferred_servers_spec.rb
+++ b/spec/acceptance/preferred_servers_spec.rb
@@ -10,7 +10,7 @@ class { '::ntp':
 
   it 'applies cleanly' do
     apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
+      expect(r.stderr).not_to match(/error/i)
     end
   end
 
diff --git a/spec/acceptance/restrict_spec.rb b/spec/acceptance/restrict_spec.rb
index 753b1b3d..66e153bc 100644
--- a/spec/acceptance/restrict_spec.rb
+++ b/spec/acceptance/restrict_spec.rb
@@ -7,7 +7,8 @@
     it 'runs twice' do
       2.times do
         apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stderr).to be_empty
+          expect(r.stderr).not_to match(/error/i)
+          expect(r.exit_code).to be_zero
         end
       end
     end