summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2018-05-02 11:04:12 +0100
committerThom May <thom@chef.io>2018-05-02 11:04:12 +0100
commit88adc980804094c054ae7157a2052a6c775c3e42 (patch)
treea6203aabad8228f408e99cc68d3e1b9f7f2f7c7b /spec/integration
parent4a053a756e8ba4ab9d1fcad384396f465eb1cee7 (diff)
downloadchef-88adc980804094c054ae7157a2052a6c775c3e42.tar.gz
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>
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/client/client_spec.rb2
-rw-r--r--spec/integration/client/ipv6_spec.rb2
-rw-r--r--spec/integration/solo/solo_spec.rb4
3 files changed, 4 insertions, 4 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