Merge pull request #682 from bastelfreak/helper2

Cleanup and fix acceptance test helper

Author: bastelfreak

spec/acceptance/zabbix_application_spec.rb

@@ -38,7 +38,7 @@ class { 'zabbix':
     # setup zabbix. Apache module isn't idempotent and requires a second run
     it 'works with no error on the first apply' do
       # Cleanup old database
-      shell('/opt/puppetlabs/bin/puppet resource service zabbix-server ensure=stopped; /opt/puppetlabs/bin/puppet resource package zabbix-server-pgsql ensure=purged; rm -f /etc/zabbix/.*done; su - postgres -c "psql -c \'drop database if exists zabbix_server;\'"')
+      cleanup_zabbix
 
       apply_manifest(pp1, catch_failures: true)
     end

spec/acceptance/zabbix_host_spec.rb

@@ -31,7 +31,7 @@ class { 'zabbix':
     # setup zabbix. Apache module isn't idempotent and requires a second run
     it 'works with no error on the first apply' do
       # Cleanup old database
-      shell('/opt/puppetlabs/bin/puppet resource service zabbix-server ensure=stopped; /opt/puppetlabs/bin/puppet resource package zabbix-server-pgsql ensure=purged; rm -f /etc/zabbix/.*done; su - postgres -c "psql -c \'drop database if exists zabbix_server;\'"')
+      cleanup_zabbix
 
       apply_manifest(pp1, catch_failures: true)
     end

spec/acceptance/zabbix_hostgroup_spec.rb

@@ -36,7 +36,7 @@ class { 'zabbix':
       shell('yum clean metadata') if fact('os.family') == 'RedHat'
 
       # Cleanup old database
-      shell('/opt/puppetlabs/bin/puppet resource service zabbix-server ensure=stopped; /opt/puppetlabs/bin/puppet resource package zabbix-server-pgsql ensure=purged; rm -f /etc/zabbix/.*done; su - postgres -c "psql -c \'drop database if exists zabbix_server;\'"')
+      cleanup_zabbix
 
       apply_manifest(pp, catch_failures: true)
     end

spec/acceptance/zabbix_proxy_spec.rb

@@ -42,7 +42,7 @@ class { 'zabbix':
       shell('yum clean metadata') if fact('os.family') == 'RedHat'
 
       # Cleanup old database
-      shell('/opt/puppetlabs/bin/puppet resource service zabbix-server ensure=stopped; /opt/puppetlabs/bin/puppet resource package zabbix-server-pgsql ensure=purged; rm -f /etc/zabbix/.*done; su - postgres -c "psql -c \'drop database if exists zabbix_server;\'"')
+      cleanup_zabbix
 
       apply_manifest(pp, catch_failures: true)
     end

spec/acceptance/zabbix_template_host_spec.rb

@@ -47,7 +47,7 @@ class { 'zabbix':
       shell("echo '<?xml version=\"1.0\" encoding=\"UTF-8\"?><zabbix_export><version>3.0</version><date>2018-12-13T15:00:46Z</date><groups><group><name>Templates/Applications</name></group></groups><templates><template><template>TestTemplate1</template><name>TestTemplate1</name><description/><groups><group><name>Templates/Applications</name></group></groups><applications/><items/><discovery_rules/><macros/><templates/><screens/></template></templates></zabbix_export>' > /root/TestTemplate1.xml")
 
       # Cleanup old database
-      shell('/opt/puppetlabs/bin/puppet resource service zabbix-server ensure=stopped; /opt/puppetlabs/bin/puppet resource package zabbix-server-pgsql ensure=purged; rm -f /etc/zabbix/.*done; su - postgres -c "psql -c \'drop database if exists zabbix_server;\'"')
+      cleanup_zabbix
 
       apply_manifest(pp, catch_failures: true)
     end

spec/acceptance/zabbix_template_spec.rb

@@ -33,7 +33,7 @@ class { 'zabbix':
       shell("echo '<?xml version=\"1.0\" encoding=\"UTF-8\"?><zabbix_export><version>3.0</version><date>2018-12-13T15:00:46Z</date><groups><group><name>Templates/Applications</name></group></groups><templates><template><template>TestTemplate1</template><name>TestTemplate1</name><description/><groups><group><name>Templates/Applications</name></group></groups><applications/><items/><discovery_rules/><macros/><templates/><screens/></template></templates></zabbix_export>' > /root/TestTemplate1.xml")
 
       # Cleanup old database
-      shell('/opt/puppetlabs/bin/puppet resource service zabbix-server ensure=stopped; /opt/puppetlabs/bin/puppet resource package zabbix-server-pgsql ensure=purged; rm -f /etc/zabbix/.*done; su - postgres -c "psql -c \'drop database if exists zabbix_server;\'"')
+      cleanup_zabbix
 
       apply_manifest(pp, catch_failures: true)
     end

spec/spec_helper_acceptance.rb

@@ -17,3 +17,5 @@
     end
   end
 end
+
+Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }

spec/support/acceptance/cleanup_zabbix.rb

@@ -0,0 +1,11 @@
+def cleanup_zabbix
+  cleanup_script = <<-SHELL
+  /opt/puppetlabs/bin/puppet resource service zabbix-server ensure=stopped
+  /opt/puppetlabs/bin/puppet resource package zabbix-server-pgsql ensure=purged
+  rm -f /etc/zabbix/.*done
+  if id postgres > /dev/null 2>&1; then
+    su - postgres -c "psql -c 'drop database if exists zabbix_server;'"
+  fi
+  SHELL
+  shell(cleanup_script)
+end