summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremiah Snapp <jeremiah@chef.io>2021-12-30 09:09:31 -0500
committerJeremiah Snapp <jeremiah@chef.io>2021-12-30 09:09:31 -0500
commit1ad39eaa668137c9a2b70579ad77805d3858ab77 (patch)
tree3130b27123dd26cad07957d37db8d11b91d8eebb
parentbf2ea4e13e17f1dae78728312f5e76cce4e54166 (diff)
downloadchef-1ad39eaa668137c9a2b70579ad77805d3858ab77.tar.gz
Add a delay in a few tests for FreeBSD
Signed-off-by: Jeremiah Snapp <jeremiah@chef.io>
-rw-r--r--omnibus/omnibus-test.sh2
-rw-r--r--spec/functional/resource/group_spec.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
index 47b21ae431..9e104e3525 100644
--- a/omnibus/omnibus-test.sh
+++ b/omnibus/omnibus-test.sh
@@ -116,6 +116,8 @@ fi
# accept license
export CHEF_LICENSE=accept-no-persist
+sudo cp spec/functional/resource/group_spec.rb /opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.18/spec/functional/resource/group_spec.rb
+
cd "$chef_gem"
sudo -E bundle install --jobs=3 --retry=3
sudo -E bundle exec rspec --profile -f progress
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index 87953455b9..d1a0913c3d 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -47,7 +47,8 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
# 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")
+ puts "sleeping 15 before looking at #{group_name}"
+ sleep 15
Etc.getgrnam(group_name).mem.include?(user)
end
end