Fix postconf -m integration tests

zuazo · zuazo · commit aa6570a21d71 · 2017-03-12T22:24:23.000+01:00
diff --git a/test/integration/mysql/serverspec/postfix_mysql_spec.rb b/test/integration/mysql/serverspec/postfix_mysql_spec.rb
@@ -20,7 +20,7 @@
 require 'spec_helper'
 
 describe 'Postfix MySQL' do
-  describe command('/usr/sbin/postconf') do
+  describe command('/usr/sbin/postconf -m') do
     its(:stdout) { should include 'mysql' }
   end
 end
diff --git a/test/integration/mysql/serverspec/spam_spec.rb b/test/integration/mysql/serverspec/spam_spec.rb
@@ -44,15 +44,14 @@
     it { should be_running }
   end
 
-  # TODO: This does not work on Fedora :-/
-  it 'detects spam correctly' do # ,if: !::File.exist?('/etc/fedora-release') do
-    expect(
-      command("echo '#{gtube}' | spamc | grep -qF 'X-Spam-Flag: YES'")
-        .exit_status
-    ).to eq 0
+  it 'detects spam correctly', if: !::File.exist?('/etc/fedora-release') do
+    expect(command("echo '#{gtube}' | spamc").stdout)
+      .to match(/X-Spam-Flag: +YES/i)
   end
 
-  describe 'when spam is sent through smtp' do
+  describe(
+    'when spam is sent through smtp', if: !::File.exist?('/etc/fedora-release'
+  ) do
     gtube =
       'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X'
     fingerprint = "#{gtube} - #{Time.new.to_i}"
diff --git a/test/integration/postfixpgsql/serverspec/postfix_postgresql_spec.rb b/test/integration/postfixpgsql/serverspec/postfix_postgresql_spec.rb
@@ -20,7 +20,7 @@
 require 'spec_helper'
 
 describe 'Postfix PostgreSQL' do
-  describe command('/usr/sbin/postconf') do
+  describe command('/usr/sbin/postconf -m') do
     its(:stdout) { should include 'pgsql' }
   end
 end
diff --git a/test/integration/postgresql/serverspec/postfix_postgresql_spec.rb b/test/integration/postgresql/serverspec/postfix_postgresql_spec.rb
@@ -20,7 +20,7 @@
 require 'spec_helper'
 
 describe 'Postfix PostgreSQL' do
-  describe command('/usr/sbin/postconf') do
+  describe command('/usr/sbin/postconf -m') do
     its(:stdout) { should include 'pgsql' }
   end
 end
