From 806a56de6ae5fe956508ad6bfc90cb6f39cb1807 Mon Sep 17 00:00:00 2001 From: markgibbons Date: Tue, 16 Aug 2016 14:10:44 -0700 Subject: Style fixes --- lib/ohai/plugins/kernel.rb | 2 +- spec/unit/plugins/solaris2/kernel_spec.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ohai/plugins/kernel.rb b/lib/ohai/plugins/kernel.rb index b3a67fdc..5002d266 100644 --- a/lib/ohai/plugins/kernel.rb +++ b/lib/ohai/plugins/kernel.rb @@ -151,7 +151,7 @@ Ohai.plugin(:Kernel) do so = shell_out("uname -s") kernel[:os] = so.stdout.split($/)[0] - so = File.open('/etc/release') { |file| file.gets } + so = File.open("/etc/release") { |file| file.gets } md = /(?\d.*\d)/.match(so) kernel[:update] = md[:update] if md diff --git a/spec/unit/plugins/solaris2/kernel_spec.rb b/spec/unit/plugins/solaris2/kernel_spec.rb index bddaf7bb..b90ec990 100644 --- a/spec/unit/plugins/solaris2/kernel_spec.rb +++ b/spec/unit/plugins/solaris2/kernel_spec.rb @@ -147,22 +147,22 @@ describe Ohai::System, "Solaris2.X kernel plugin" do @release = StringIO.new(" Solaris 10 10/08 s10s_u6wos_07b SPARC\n Use is subject to license terms.\n Assembled 27 October 2008") allow(File).to receive(:open).with("/etc/release").and_yield(@release) @plugin.run - expect(@plugin[:kernel][:update]).to eq('10 10/08 s10s_u6wos_07') - end + expect(@plugin[:kernel][:update]).to eq("10 10/08 s10s_u6wos_07") + end it "should give the Oracle Solaris update version informtion" do @release = StringIO.new(" Oracle Solaris 10 1/13 s10s_u11wos_24a SPARC\n Assembled 17 January 2013") allow(File).to receive(:open).with("/etc/release").and_yield(@release) @plugin.run - expect(@plugin[:kernel][:update]).to eq('10 1/13 s10s_u11wos_24') - end + expect(@plugin[:kernel][:update]).to eq("10 1/13 s10s_u11wos_24") + end it "should give the Solaris 11 update version informtion" do @release = StringIO.new(" Oracle Solaris 11.3 SPARC\n Assembled 25 July 2016") allow(File).to receive(:open).with("/etc/release").and_yield(@release) @plugin.run - expect(@plugin[:kernel][:update]).to eq('11.3') - end + expect(@plugin[:kernel][:update]).to eq("11.3") + end it_should_check_from_deep_mash("solaris2::kernel", "kernel", "os", "uname -s", [0, "SunOS\n", ""]) -- cgit v1.2.1