add diff tests for each os type

Signed-off-by: Patrick Münch <[email protected]>

Author: atomic111

controls/postgres_spec.rb

@@ -66,14 +66,21 @@
   impact 1.0
   title 'Postgresql should be running'
   desc 'Postgresql should be running.'
+  # describe service(postgres.service) do
+  #   it { should be_installed }
+  #   it { should be_running }
+  #   it { should be_enabled }
+  # end
   case os[:name]
   when 'ubuntu'
     case os[:release]
     when '12.04'
-      describe service(postgres.service) do
-        it { should be_installed }
-        it { should be_running }
-        it { should be_enabled }
+      describe command('/etc/init.d/postgresql status') do
+        its('stdout') { should include 'online' }
+      end
+    when '14.04'
+      describe command('service postgresql status') do
+        its('stdout') { should include 'online' }
       end
     when '16.04'
       describe systemd_service(postgres.service) do
@@ -82,19 +89,22 @@
         it { should be_enabled }
       end
     end
-  when 'redhat', 'centos', 'oracle'
+  when 'debian'
+    case os[:release]
+    when /7\./
+      describe command('/etc/init.d/postgresql status') do
+        its('stdout') { should include 'Running' }
+      end
+    end
+  when 'redhat', 'centos', 'oracle', 'fedora'
     case os[:release]
     when /6\./
-      describe runit_service(postgres.service) do
-        it { should be_installed }
-        it { should be_running }
-        it { should be_enabled }
+      describe command('/etc/init.d/postgresql-9.4 status') do
+        its('stdout') { should include 'running' }
       end
     when /7\./
-      describe systemd_service(postgres.service) do
-        it { should be_installed }
-        it { should be_running }
-        it { should be_enabled }
+      describe command('ps aux | awk /\'bin\/postgres\'/ | wc -l') do
+        its('stdout') { should include '1' }
       end
     end
   end
@@ -105,7 +115,7 @@
   title 'Use stable postgresql version'
   desc 'Use only community or commercially supported version of the PostgreSQL software. Do not use RC, DEVEL oder BETA versions in a production environment.'
   describe command('psql -V') do
-    its('stdout') { should match(/9.[2-5]/) }
+    its('stdout') { should match(/9.[1-5]/) }
   end
   describe command('psql -V') do
     its('stdout') { should_not match(/RC/) }
@@ -118,14 +128,10 @@
   impact 1.0
   title 'Run one postgresql instance per operating system'
   desc 'Only one postgresql database instance must be running on an operating system instance (both physical HW or virtualized).'
-  if os[:family] == 'debian'
-    describe processes('postgres') do
-      its('list.length') { should eq 1 }
-    end
-  elsif os[:family] == 'redhat'
-    describe processes('postmaster') do
-      its('list.length') { should eq 1 }
-    end
+  pg_command = 'postgres'
+  pg_command = 'postmaster' if os.redhat? && os.release.include?('6.')
+  describe processes(pg_command) do
+    its('list.length') { should eq 1 }
   end
 end