diff options
author | Marc A. Paradise <marcparadise@users.noreply.github.com> | 2022-10-07 15:00:42 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-07 15:00:42 +0000 |
commit | 32730c085e8b67865f930654d96acb31dfdd008c (patch) | |
tree | aa907d4d6e1a5f78ea9bc90f961c830e0a8f27df | |
parent | 9c43a97b4f2722f5e88ceb290817e82c4ef336b4 (diff) | |
parent | 8ab9886ab28ff37db5af96ff60d598e5525dfc0c (diff) | |
download | chef-32730c085e8b67865f930654d96acb31dfdd008c.tar.gz |
Merge pull request #13220 from chef/neha-p6/INFC-178-aix-specs
On AIX, add delay to ensure members added to group are visible to tests
Note that current failing Solaris verification is due to known issue with invalid/missing repository checksums on that platform.
-rw-r--r-- | .expeditor/release.omnibus.yml | 2 | ||||
-rw-r--r-- | spec/functional/resource/group_spec.rb | 12 | ||||
-rw-r--r-- | spec/functional/resource/link_spec.rb | 16 |
3 files changed, 17 insertions, 13 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 5007f6567e..00caa4b971 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -15,7 +15,7 @@ builder-to-testers-map: aix-7.1-powerpc: - aix-7.1-powerpc - aix-7.2-powerpc - # - aix-7.3-powerpc + - aix-7.3-powerpc # amazon-2022-aarch64: # - amazon-2022-aarch64 # amazon-2022-x86_64: diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 9360020537..6e074a3e44 100644 --- a/spec/functional/resource/group_spec.rb +++ b/spec/functional/resource/group_spec.rb @@ -44,10 +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") + # NOTE: For some reason our temporary AIX 7.x systems do not correctly report group membership immediately after changes have been made. + # Adding a delay for this platform is enough to get correct results. + # reference: https://github.com/chef/release-engineering/issues/1617 + sleep 3 if aix? Etc.getgrnam(group_name).mem.include?(user) end end @@ -133,6 +133,10 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do temp_resource.append(true) temp_resource.run_action(:modify) members.each do |member| + # NOTE For some reason our temporary AIX 7.x systems do not correctly report group membership immediately after changes have been made. + # Adding a delay for this platform is enough to get correct results. + # reference: https://github.com/chef/release-engineering/issues/1617 + sleep 3 if aix? expect(user_exist_in_group?(member)).to eq(true) end end diff --git a/spec/functional/resource/link_spec.rb b/spec/functional/resource/link_spec.rb index 4637896fd7..480c2df92f 100644 --- a/spec/functional/resource/link_spec.rb +++ b/spec/functional/resource/link_spec.rb @@ -345,17 +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") + # NOTE: For some reason our temporary AIX 7.x systems do not correctly report user existence immediately after changes have been made. + # Adding a delay for this platform is enough to get correct results. + # reference: https://github.com/chef/release-engineering/issues/1617 + sleep 3 if aix? 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") + # TODO For some reason our temporary AIX 7.x systems do not correctly report user existence immediately after changes have been made. + # Adding a delay for this platform is enough to get correct results. + # reference: https://github.com/chef/release-engineering/issues/1617 + sleep 3 if aix? end before(:each) do resource.owner(test_user) |