summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-12-06 11:12:59 -0800
committerGitHub <noreply@github.com>2019-12-06 11:12:59 -0800
commit78b8b769d615b8c431b778e90c7dbfa50ae3a13d (patch)
treea45459f0c7e9b713f1ac32271509572a7b9d1d2c
parentd2bb31fa2308b16a21c070e88438261c4becc2bd (diff)
parentafba5adcec97c0c5d24dfd5a69247b53a0d57deb (diff)
downloadchef-78b8b769d615b8c431b778e90c7dbfa50ae3a13d.tar.gz
Merge pull request #9142 from chef/csnapp/fix_test_failures
Fix Chef-14 Test Failures
-rw-r--r--omnibus/omnibus-test.sh3
-rw-r--r--spec/functional/resource/group_spec.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
index 95ac30bec4..963b91c4b8 100644
--- a/omnibus/omnibus-test.sh
+++ b/omnibus/omnibus-test.sh
@@ -147,6 +147,9 @@ elif [[ -d /usr/local/etc/sudoers.d ]]; then
sudo chmod 440 "/usr/local/etc/sudoers.d/$(id -un)-preserve_path"
fi
+# REDO 20190813 - this ulimit can be removed once the macos anka images are updated to support more than 256 open files
+ulimit -S -n 512
+
cd "$chef_gem"
sudo -E bundle install
sudo -E bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index 02e94da9d3..a46dc1169f 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -425,7 +425,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ"
end
end
- describe "group manage action" do
+ describe "group manage action", :not_supported_on_solaris do
let(:spec_members) { %w{mnou5sdz htulrvwq x4c3g1lu} }
let(:included_members) { [spec_members[0], spec_members[1]] }
let(:excluded_members) { [spec_members[2]] }