Fix log test to replicate bug #182

Signed-off-by: Ken Barber <ken@bob.sh>

diff --git a/spec/system/params_spec.rb b/spec/system/params_spec.rb
index 29fba22e8e219ebb2677bf36cc1191ec8f4afe22..abc0f61eb482a4b6cfd2b12caf41f26687ff0a7d 100644 (file)
--- a/spec/system/params_spec.rb
+++ b/spec/system/params_spec.rb
@@ -77,7 +77,8 @@ firewall { '#{name}':
       'proto' => 'all',
       'state' => 'INVALID',
       'jump' => 'LOG',
-      'log_level' => 'debug',
+      'log_level' => '3',
+      'log_prefix' => '"IPTABLES dropped invalid: "',
     })
 
     ppm2 = pp({
@@ -86,27 +87,22 @@ firewall { '#{name}':
       'proto' => 'all',
       'state' => 'INVALID',
       'jump' => 'LOG',
-      'log_level' => 'debug',
+      'log_level' => '3',
+      'log_prefix' => '"IPTABLES dropped invalid: "',
     })
 
     puppet_apply(ppm1) do |r|
-      r.stderr.should == ''
+      r.stderr.should be_empty
       r.exit_code.should == 2
     end
 
-    puppet_apply(ppm1) do |r|
-      r.stderr.should == ''
-      r.exit_code.should == 0
-    end
-
-    # check idempotency
     ppm = <<-EOS + "\n" + ppm2
       resources { 'firewall':
         purge => true,
       }
     EOS
     puppet_apply(ppm) do |r|
-      r.stderr.should == ''
+      r.stderr.should be_empty
       r.exit_code.should == 2
     end
   end