diff options
| author | Davide Cavalca <dcavalca@fb.com> | 2016-03-08 11:57:59 -0800 |
|---|---|---|
| committer | Davide Cavalca <dcavalca@fb.com> | 2016-03-08 11:57:59 -0800 |
| commit | 6c02c7798d05e0e3fd9cfab6254149684b0206ea (patch) | |
| tree | 6a851864bfc8394135206752b83a461b97b5f2cd | |
| parent | f5f0e2985f021997d4cdedc683cd77635032e578 (diff) | |
| download | ohai-6c02c7798d05e0e3fd9cfab6254149684b0206ea.tar.gz | |
Revert "use shell_out!"
This reverts commit f5f0e2985f021997d4cdedc683cd77635032e578.
| -rw-r--r-- | lib/ohai/plugins/linux/sessions.rb | 3 | ||||
| -rw-r--r-- | spec/unit/plugins/linux/sessions_spec.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/ohai/plugins/linux/sessions.rb b/lib/ohai/plugins/linux/sessions.rb index bd1364c8..f2f33bba 100644 --- a/lib/ohai/plugins/linux/sessions.rb +++ b/lib/ohai/plugins/linux/sessions.rb @@ -25,11 +25,10 @@ Ohai.plugin(:Sessions) do collect_data(:linux) do loginctl_path = which("loginctl") - if loginctl_path cmd = "#{loginctl_path} --no-pager --no-legend --no-ask-password " + "list-sessions" - loginctl = shell_out!(cmd) + loginctl = shell_out(cmd) sessions Mash.new unless sessions sessions[:by_session] = Mash.new unless sessions[:by_session] diff --git a/spec/unit/plugins/linux/sessions_spec.rb b/spec/unit/plugins/linux/sessions_spec.rb index 1e1ab2c1..32936670 100644 --- a/spec/unit/plugins/linux/sessions_spec.rb +++ b/spec/unit/plugins/linux/sessions_spec.rb @@ -33,7 +33,7 @@ describe Ohai::System, "Linux sessions plugin" do 306 1000 joe LOGINCTL_OUT allow(plugin).to receive(:which).with("loginctl").and_return("/bin/loginctl") - allow(plugin).to receive(:shell_out!).with("/bin/loginctl --no-pager --no-legend --no-ask-password list-sessions").and_return(mock_shell_out(0, loginctl_out, "")) + allow(plugin).to receive(:shell_out).with("/bin/loginctl --no-pager --no-legend --no-ask-password list-sessions").and_return(mock_shell_out(0, loginctl_out, "")) plugin.run expect(plugin[:sessions].to_hash).to eq({ "by_session" => { |