summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2016-10-24 10:08:23 -0500
committerGitHub <noreply@github.com>2016-10-24 10:08:23 -0500
commiteac2e5970cbd0ebaa0fb759239ed390b9244d254 (patch)
tree5c385755a610b24d7d13167d4b0c623e37ff8a1e
parent5d0065ab5ee6a73e6b67b5a7a8350f752cf86dbf (diff)
parent854a3d0c5566e4ec536df4573260087048eccd56 (diff)
downloadchef-eac2e5970cbd0ebaa0fb759239ed390b9244d254.tar.gz
Merge pull request #5482 from chef/COOL-597/use-all-for-assertion
Use `all?` instead of `any?` to check for SUSE users
-rw-r--r--lib/chef/provider/group/suse.rb2
-rw-r--r--spec/functional/resource/group_spec.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/provider/group/suse.rb b/lib/chef/provider/group/suse.rb
index 273485df16..71336f9311 100644
--- a/lib/chef/provider/group/suse.rb
+++ b/lib/chef/provider/group/suse.rb
@@ -41,7 +41,7 @@ class Chef
requirements.assert(:create, :manage, :modify) do |a|
a.assertion do
begin
- to_add(@new_resource.members).any? { |member| Etc.getpwnam(member) }
+ to_add(@new_resource.members).all? { |member| Etc.getpwnam(member) }
rescue
false
end
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index 31f9933546..7effd386a4 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -425,6 +425,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end
end
it "does not raise an error on manage" do
+ allow(Etc).to receive(:getpwnam).and_return(double("User"))
expect { group_resource.run_action(:manage) }.not_to raise_error
end
end