diff options
| author | blabade <107531905+blabade@users.noreply.github.com> | 2022-10-21 14:29:12 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-21 14:29:12 +0530 |
| commit | d525dfc055d2c9cf3696c4921609ae5810b52c06 (patch) | |
| tree | ded18ed48d8fb62b6a234be091b13abbb83aa6d7 | |
| parent | c2c4e6e526655f278a48d6db5015bb2a7fd4609d (diff) | |
| parent | 46e009290682a5dd06bff1bdde9f42775f030a41 (diff) | |
| download | chef-d525dfc055d2c9cf3696c4921609ae5810b52c06.tar.gz | |
Merge pull request #13243 from chef/fix/INFC-291_solaris
[chef-17] Update omnibus version to fix read_shared_libs to fix solaris adhoc pipeline issue
| -rw-r--r-- | omnibus/Gemfile.lock | 2 | ||||
| -rw-r--r-- | spec/functional/shell_spec.rb | 6 | ||||
| -rw-r--r-- | spec/unit/daemon_spec.rb | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 487cf46dce..4210d718b3 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,7 +8,7 @@ GIT GIT remote: https://github.com/chef/omnibus.git - revision: d1fe3bbba0bf8c6cbc0e9d75bfcc8216e4345078 + revision: 5bc091ab3ed4ab002ef85dad3923914c25bb3dcd branch: main specs: omnibus (9.0.8) diff --git a/spec/functional/shell_spec.rb b/spec/functional/shell_spec.rb index 2289df3ef1..bd3dc16218 100644 --- a/spec/functional/shell_spec.rb +++ b/spec/functional/shell_spec.rb @@ -80,6 +80,12 @@ describe Shell do # so hide the require here require "pty" + + # FIXME this is temporary... Solaris envs have TERM set to unknown + # and the value isn't propagating from the build environment TERM + # variable + ENV["TERM"] = "vt100" if ["", "unknown"].include?(ENV["TERM"].to_s) + config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA) reader, writer, pid = PTY.spawn("bundle exec chef-shell --no-multiline --no-singleline --no-colorize -c #{config} #{options}") read_until(reader, "chef (#{Chef::VERSION})>") diff --git a/spec/unit/daemon_spec.rb b/spec/unit/daemon_spec.rb index f91210277b..05a09a5857 100644 --- a/spec/unit/daemon_spec.rb +++ b/spec/unit/daemon_spec.rb @@ -170,11 +170,7 @@ describe Chef::Daemon do it "should log an appropriate error message and fail miserably" do allow(Process).to receive(:initgroups).and_raise(Errno::EPERM) - error = "Operation not permitted" - if RUBY_PLATFORM.match("solaris2") || RUBY_PLATFORM.match("aix") - error = "Not owner" - end - expect(Chef::Application).to receive(:fatal!).with("Permission denied when trying to change 999:999 to 501:20. #{error}") + expect(Chef::Application).to receive(:fatal!).with(/Permission denied when trying to change 999:999 to 501:20/) Chef::Daemon._change_privilege(testuser) end end |