spec_helper

voxpupuli · Mar 9, 2020 · af9bd72 · af9bd72
1 parent 835949b
commit af9bd72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -32,7 +32,7 @@ class { '::collectd': }
       class { '::collectd::plugin::memory': }
 
       # rabbitmq plugin not ported to Python3
-      if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] != '8' {
+      unless $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {
         class { '::collectd::plugin::rabbitmq': }
       }
       class { 'collectd::plugin::csv':}
@@ -50,7 +50,7 @@ class { 'collectd::plugin::csv':}
       end
     end
 
-    if fact('osfamily') == 'RedHat' && fact('os.release.major') != '8'
+    if fact('osfamily') == 'RedHat' && fact('os.release.major') == '7'
       describe file('/etc/collectd.d/10-rabbitmq.conf') do
         it { is_expected.to be_file }
         it { is_expected.to contain 'TypesDB "/usr/share/collectd-rabbitmq/types.db.custom"' }

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -5,8 +5,6 @@
 
 run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
 
-on 'debian', 'apt-get -y install apt-transport-https'
-
 RSpec.configure do |c|
   # Readable test descriptions
   c.formatter = :documentation
@@ -15,16 +13,5 @@
   c.before :suite do
     install_module
     install_module_dependencies
-
-    hosts.each do |host|
-      # python is pre-requisite to the python_path fact.
-      # apt-transport-https is pre-requisite for https repos.
-      case host['platform']
-      when %r{el-8}
-        host.install_package('python3')
-      else
-        host.install_package('python')
-      end
-    end
   end
 end