diff options
author | Tim Smith <tsmith@chef.io> | 2021-09-07 13:52:06 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-07 13:52:06 -0700 |
commit | d9a8e2a77f73c0cb25a7d13ad3d1ae470a939dc7 (patch) | |
tree | a232f947d56e7999b00ecf092af74dd0bab74c64 | |
parent | edff419c3e97f8ac3e3b1e83dde009f2d35d7a6a (diff) | |
parent | 551c9463359579128778b427607e9cc79cbfeda8 (diff) | |
download | chef-d9a8e2a77f73c0cb25a7d13ad3d1ae470a939dc7.tar.gz |
Merge pull request #12004 from chef/jsnapp/fix-tests-for-new-test-systems
Fix tests for new omnibus test systems
-rw-r--r-- | spec/functional/resource/group_spec.rb | 6 | ||||
-rw-r--r-- | spec/functional/resource/link_spec.rb | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 279f8ac8d4..87953455b9 100644 --- a/spec/functional/resource/group_spec.rb +++ b/spec/functional/resource/group_spec.rb @@ -44,6 +44,10 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do members.shift # Get rid of GroupMembership: string members.include?(user) else + # TODO For some reason our temporary AIX 7.2 system does not correctly report group membership immediately after changes have been made. + # Adding a 2 second delay for this platform is enough to get correct results. + # We hope to remove this delay after we get more permanent AIX 7.2 systems in our CI pipeline. reference: https://github.com/chef/release-engineering/issues/1617 + sleep 2 if aix? && (ohai[:platform_version] == "7.2") Etc.getgrnam(group_name).mem.include?(user) end end @@ -181,7 +185,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do describe "when the users exist" do before do - high_uid = 30000 + high_uid = 40000 (spec_members).each do |member| remove_user(member) create_user(member, high_uid) diff --git a/spec/functional/resource/link_spec.rb b/spec/functional/resource/link_spec.rb index 734897aaa4..4637896fd7 100644 --- a/spec/functional/resource/link_spec.rb +++ b/spec/functional/resource/link_spec.rb @@ -345,9 +345,17 @@ describe Chef::Resource::Link do let(:test_user) { "test-link-user" } before do user(test_user).run_action(:create) + # TODO For some reason our temporary AIX 7.2 system does not correctly report user existence immediately after changes have been made. + # Adding a 2 second delay for this platform is enough to get correct results. + # We hope to remove this delay after we get more permanent AIX 7.2 systems in our CI pipeline. reference: https://github.com/chef/release-engineering/issues/1617 + sleep 2 if aix? && (ohai[:platform_version] == "7.2") end after do user(test_user).run_action(:remove) + # TODO For some reason our temporary AIX 7.2 system does not correctly report user existence immediately after changes have been made. + # Adding a 2 second delay for this platform is enough to get correct results. + # We hope to remove this delay after we get more permanent AIX 7.2 systems in our CI pipeline. reference: https://github.com/chef/release-engineering/issues/1617 + sleep 2 if aix? && (ohai[:platform_version] == "7.2") end before(:each) do resource.owner(test_user) |