Merge pull request #347 from bastelfreak/cleanup

Cleanup acceptance tests
voxpupuli · Jul 15, 2019 · 5ab2695 · 5ab2695
2 parents c7b59dc + 75c9fdc
commit 5ab2695
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 40 deletions.
diff --git a/spec/acceptance/apache_exporter_spec.rb b/spec/acceptance/apache_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus apache exporter' do
   it 'apache_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::apache_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/collectd_exporter_spec.rb b/spec/acceptance/collectd_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus collectd exporter' do
   it 'collectd_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::collectd_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/haproxy_exporter_spec.rb b/spec/acceptance/haproxy_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus haproxy_exporter' do
   it 'haproxy_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::haproxy_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/mysqld_exporter_spec.rb b/spec/acceptance/mysqld_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus mysqld exporter' do
   it 'mysqld_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::mysqld_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/nginx_vts_exporter_spec.rb b/spec/acceptance/nginx_vts_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus nginx_vts_exporter' do
   it 'nginx_vts_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::nginx_vts_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/node_exporter_spec.rb b/spec/acceptance/node_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus node_exporter' do
   it 'node_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::node_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/postgres_exporter_spec.rb b/spec/acceptance/postgres_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus postgres exporter' do
   it 'postgres_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = "class{'prometheus::postgres_exporter': postgres_pass => 'password', postgres_user => 'username' }"
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/prometheus_exporter_spec.rb b/spec/acceptance/prometheus_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus exporter' do
   it 'graphite_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::graphite_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/prometheus_server_spec.rb b/spec/acceptance/prometheus_server_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus server basics' do
   it 'prometheus server via main class works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = "class{'prometheus': manage_prometheus_server => true, version => '1.5.2' }"
 
     # Run it twice and test for idempotency

diff --git a/spec/acceptance/redis_exporter_spec.rb b/spec/acceptance/redis_exporter_spec.rb
@@ -2,10 +2,6 @@
 
 describe 'prometheus redis exporter' do
   it 'redis_exporter works idempotently with no errors' do
-    if default[:platform] =~ %r{ubuntu-18.04-amd64}
-      pp = "package{'iproute2': ensure => present}"
-      apply_manifest(pp, catch_failures: true)
-    end
     pp = 'include prometheus::redis_exporter'
     # Run it twice and test for idempotency
     apply_manifest(pp, catch_failures: true)