diff options
author | Bryan McLellan <btm@loftninjas.org> | 2019-04-12 11:01:39 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-12 11:01:39 -0400 |
commit | af5c11d4727e7f623074ee26929021eb433ce485 (patch) | |
tree | 4563e542653c7409c7734789ee1f4b09791ec582 | |
parent | d79e710d6c9166b35c3960bc444f268b202c3066 (diff) | |
parent | 0630b19a86f14cca281f951a58ed148df9e26636 (diff) | |
download | chef-af5c11d4727e7f623074ee26929021eb433ce485.tar.gz |
Merge pull request #8364 from chef/btm/14-backport-test-fixes
Backport two test fixes/changes to chef-14
-rw-r--r-- | spec/functional/resource/dsc_script_spec.rb | 2 | ||||
-rw-r--r-- | spec/functional/resource/group_spec.rb | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/spec/functional/resource/dsc_script_spec.rb b/spec/functional/resource/dsc_script_spec.rb index 1caa07d105..0439625778 100644 --- a/spec/functional/resource/dsc_script_spec.rb +++ b/spec/functional/resource/dsc_script_spec.rb @@ -74,11 +74,11 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only do let(:env_value2) { "value2" } let(:dsc_test_run_context) do node = Chef::Node.new + node.consume_external_attrs(OHAI_SYSTEM.data, {}) # node[:languages][:powershell][:version] node.automatic["os"] = "windows" node.automatic["platform"] = "windows" node.automatic["platform_version"] = "6.1" node.automatic["kernel"][:machine] = :x86_64 # Only 64-bit architecture is supported - node.automatic[:languages][:powershell][:version] = "4.0" empty_events = Chef::EventDispatch::Dispatcher.new Chef::RunContext.new(node, {}, empty_events) end diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 2d65d69843..32bfdb0328 100644 --- a/spec/functional/resource/group_spec.rb +++ b/spec/functional/resource/group_spec.rb @@ -292,14 +292,27 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do end end - let(:group_name) { "group#{SecureRandom.random_number(9999)}" } + let(:number) do + # Loop until we pick a gid that is not in use. + loop do + begin + gid = rand(2000..9999) # avoid low group numbers + return nil if Etc.getgrgid(gid).nil? # returns nil on windows + rescue ArgumentError # group does not exist + return gid + end + end + end + + let(:group_name) { "grp#{number}" } # group name should be 8 characters or less for Solaris, and possibly others + # https://community.aegirproject.org/developing/architecture/unix-group-limitations/index.html#Group_name_length_limits let(:included_members) { [] } let(:excluded_members) { [] } let(:group_resource) do group = Chef::Resource::Group.new(group_name, run_context) group.members(included_members) group.excluded_members(excluded_members) - group.gid(30000) unless ohai[:platform_family] == "mac_os_x" + group.gid(number) unless ohai[:platform_family] == "mac_os_x" group end |