Ensure we don't run tests on unsupported platformstm/fix_unix_tests

Our more esoteric unices need some more careful hand holding

Signed-off-by: Thom May <thom@chef.io>

5 files changed, 7 insertions, 5 deletions

diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index 77008524c8..201815ef01 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -300,7 +300,7 @@ EOM
       result.error!
     end
 
-    it "should complete with success when using --profile-ruby and output a profile file" do
+    it "should complete with success when using --profile-ruby and output a profile file", :not_supported_on_aix do
       file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
diff --git a/spec/integration/client/ipv6_spec.rb b/spec/integration/client/ipv6_spec.rb
index 68c58bb8ea..6452db1e39 100644
--- a/spec/integration/client/ipv6_spec.rb
+++ b/spec/integration/client/ipv6_spec.rb
@@ -83,7 +83,7 @@ END_CLIENT_RB
 
   # Some Solaris test platforms are too old for IPv6. These tests should not
   # otherwise be platform dependent, so exclude solaris
-  when_the_chef_server "is running on IPv6", :not_supported_on_solaris, :not_supported_on_gce do
+  when_the_chef_server "is running on IPv6", :not_supported_on_solaris, :not_supported_on_gce, :not_supported_on_aix do
 
     when_the_repository "has a cookbook with a no-op recipe" do
       before do
diff --git a/spec/integration/solo/solo_spec.rb b/spec/integration/solo/solo_spec.rb
index f6cb2e43ef..63525f0081 100644
--- a/spec/integration/solo/solo_spec.rb
+++ b/spec/integration/solo/solo_spec.rb
@@ -33,13 +33,13 @@ EOM
     describe "on unix", :unix_only do
       describe "the nodes directory" do
         it "has the correct permissions" do
-          expect(File.stat(nodes_dir).mode.to_s(8)[2..5]).to eq("700")
+          expect(File.stat(nodes_dir).mode.to_s(8)[-3..-1]).to eq("700")
         end
       end
 
       describe "the node file" do
         it "has the correct permissions" do
-          expect(File.stat(node_file).mode.to_s(8)[2..5]).to eq("0600")
+          expect(File.stat(node_file).mode.to_s(8)[-4..-1]).to eq("0600")
         end
       end
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c57c83e100..b4d337eecd 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -146,6 +146,7 @@ RSpec.configure do |config|
   config.filter_run_excluding :not_supported_on_mac_osx_106 => true if mac_osx_106?
   config.filter_run_excluding :not_supported_on_mac_osx => true if mac_osx?
   config.filter_run_excluding :mac_osx_only => true if !mac_osx?
+  config.filter_run_excluding :not_supported_on_aix => true if aix?
   config.filter_run_excluding :not_supported_on_solaris => true if solaris?
   config.filter_run_excluding :not_supported_on_gce => true if gce?
   config.filter_run_excluding :not_supported_on_nano => true if windows_nano_server?
diff --git a/spec/unit/provider/mount/mount_spec.rb b/spec/unit/provider/mount/mount_spec.rb
index cd663b9684..af7916e5bd 100644
--- a/spec/unit/provider/mount/mount_spec.rb
+++ b/spec/unit/provider/mount/mount_spec.rb
@@ -495,7 +495,8 @@ describe Chef::Provider::Mount::Mount do
 
     # the fstab might contain the mount with the device as a device but the resource has a label.
     # we should not create two mount lines, but update the existing one
-    context "when the device is described differently" do
+    # not supported on solaris because it can't cope with a UUID device type
+    context "when the device is described differently", :not_supported_on_solaris do
       it "should update the existing line" do
         @current_resource.enabled(true)
         status = double(:stdout => "/dev/sdz1\n", :exitstatus => 1)