diff options
author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-09 15:21:18 -0700 |
---|---|---|
committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-09 15:21:18 -0700 |
commit | ae97f98aa36524dbf85c8be4fb46407a7d75bedb (patch) | |
tree | 615ded36edea8ff2a2e8a6a3788ee229f6595a44 | |
parent | 6b33c080abc6154011c59c087c2979d9efeff686 (diff) | |
parent | 3961402a23b11390b6f647e36ed30af9beba3a41 (diff) | |
download | chef-ae97f98aa36524dbf85c8be4fb46407a7d75bedb.tar.gz |
Merge pull request #1164 from ClogenyTechnologies/kd-OC-9954-aix-rspec
OC-9954 - aix: use 'guest' user for rspec tests instead of 'nobody' user...
-rw-r--r-- | spec/support/shared/functional/securable_resource.rb | 13 | ||||
-rw-r--r-- | spec/support/shared/functional/securable_resource_with_reporting.rb | 15 |
2 files changed, 24 insertions, 4 deletions
diff --git a/spec/support/shared/functional/securable_resource.rb b/spec/support/shared/functional/securable_resource.rb index 48daf78ae3..98c41c1f20 100644 --- a/spec/support/shared/functional/securable_resource.rb +++ b/spec/support/shared/functional/securable_resource.rb @@ -19,6 +19,7 @@ # require 'etc' +require 'functional/resource/base' shared_context "setup correct permissions" do if windows? @@ -36,7 +37,11 @@ shared_context "setup correct permissions" do # Root only context. before :each, :unix_only, :requires_root do - File.chown(Etc.getpwnam('nobody').uid, 1337, path) + if ohai[:platform] == "aix" + File.chown(Etc.getpwnam('guest').uid, 1337, path) + else + File.chown(Etc.getpwnam('nobody').uid, 1337, path) + end end before :each, :windows_only do @@ -149,7 +154,11 @@ shared_examples_for "a securable resource with existing target" do include_context "diff disabled" context "on Unix", :unix_only do - let(:expected_user_name) { 'nobody' } + if ohai[:platform] == "aix" + let(:expected_user_name) { 'guest' } + else + let(:expected_user_name) { 'nobody' } + end let(:expected_uid) { Etc.getpwnam(expected_user_name).uid } let(:desired_gid) { 1337 } let(:expected_gid) { 1337 } diff --git a/spec/support/shared/functional/securable_resource_with_reporting.rb b/spec/support/shared/functional/securable_resource_with_reporting.rb index 2bfc257731..b02137a06c 100644 --- a/spec/support/shared/functional/securable_resource_with_reporting.rb +++ b/spec/support/shared/functional/securable_resource_with_reporting.rb @@ -1,4 +1,6 @@ +require 'functional/resource/base' + ALL_EXPANDED_PERMISSIONS = ["generic read", "generic write", "generic execute", @@ -72,7 +74,12 @@ shared_examples_for "a securable resource with reporting" do context "and owner is specified with a String (username) in new_resource", :requires_root => true do # TODO/bug: duplicated from the "securable resource" tests - let(:expected_user_name) { 'nobody' } + + if ohai[:platform] == "aix" + let(:expected_user_name) { 'guest' } + else + let(:expected_user_name) { 'nobody' } + end before do resource.owner(expected_user_name) @@ -88,7 +95,11 @@ shared_examples_for "a securable resource with reporting" do context "and owner is specified with an Integer (uid) in new_resource", :requires_root => true do # TODO: duplicated from "securable resource" - let(:expected_user_name) { 'nobody' } + if ohai[:platform] == "aix" + let(:expected_user_name) { 'guest' } + else + let(:expected_user_name) { 'nobody' } + end let(:expected_uid) { Etc.getpwnam(expected_user_name).uid } let(:desired_gid) { 1337 } let(:expected_gid) { 1337 } |