Correct the tests for aix

xbezdick · Feb 28, 2014 · eef1ea1 · eef1ea1
1 parent d28ce64
commit eef1ea1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
@@ -7,8 +7,6 @@
   servicename = 'apache2'
 when 'FreeBSD'
   servicename = 'apache22'
-else
-  raise "Unconfigured OS for apache service on #{fact('osfamily')}"
 end
 
 describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do

diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
@@ -51,5 +51,7 @@
   $error_log        = 'http-error.log'
 
   $apache_version = 2.2
+else
+  $apache_version = 0
 end
 
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
@@ -880,7 +880,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    it 'import_script applies cleanly', :unless => fact('lsbcodename') == 'lucid' do
+    it 'import_script applies cleanly', :unless => (fact('lsbcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
       pp = <<-EOS
         class { 'apache': }
         class { 'apache::mod::wsgi': }

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,15 +1,18 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 
-hosts.each do |host|
-  if host['platform'] =~ /debian/
-    on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-  end
-  if host.is_pe?
-    install_pe
-  else
-    install_puppet
-    on host, "mkdir -p #{host['distmoduledir']}"
+
+unless ENV['RS_PROVISION'] == 'no'
+  hosts.each do |host|
+    if host['platform'] =~ /debian/
+      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
+    end
+    if host.is_pe?
+      install_pe
+    else
+      install_puppet
+      on host, "mkdir -p #{host['distmoduledir']}"
+    end
   end
 end