ohai 15.2.5 → 15.3.1

data/spec/unit/plugins/linux/sysctl_spec.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Joshua Miller <joshmiller@fb.com>
+# Copyright:: Copyright (c) 2019 Facebook
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../../../spec_helper.rb"
+
+describe Ohai::System, "sysctl plugin", :unix_only do
+  let(:plugin) { get_plugin("linux/sysctl") }
+
+  it "should populate sysctl if sysctl is found" do
+    sysctl_out = <<-SYSCTL_OUT
+  vm.nr_overcommit_hugepages = 0
+  vm.numa_stat = 1
+  vm.numa_zonelist_order = Node
+  vm.oom_dump_tasks = 1
+  vm.oom_kill_allocating_task = 0
+  vm.overcommit_kbytes = 0
+    SYSCTL_OUT
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+    allow(plugin).to receive(:which).with("sysctl").and_return("/usr/sbin/sysctl")
+    allow(plugin).to receive(:shell_out).with("/usr/sbin/sysctl -a").and_return(mock_shell_out(0, sysctl_out, ""))
+    plugin.run
+    expect(plugin[:sysctl].to_hash).to eq({
+      "vm.nr_overcommit_hugepages" => "0",
+      "vm.numa_stat" => "1",
+      "vm.numa_zonelist_order" => "Node",
+      "vm.oom_dump_tasks" => "1",
+      "vm.oom_kill_allocating_task" => "0",
+      "vm.overcommit_kbytes" => "0",
+    })
+  end
+
+  it "should not populate sysctl if sysctl is not found" do
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+    allow(plugin).to receive(:which).with("sysctl").and_return(false)
+    plugin.run
+    expect(plugin[:sysctl]).to be(nil)
+  end
+end

data/spec/unit/plugins/linux/systemd_paths_spec.rb

@@ -21,11 +21,11 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 describe Ohai::System, "Linux systemd paths plugin" do
   let(:plugin) { get_plugin("linux/systemd_paths") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
   end
 
-  it "should populate systemd_paths if systemd-path is found" do
+  it "populates systemd_paths if systemd-path is found" do
     systemd_path_out = <<~SYSTEMD_PATH_OUT
       temporary: /tmp
       temporary-large: /var/tmp
@@ -114,7 +114,7 @@ describe Ohai::System, "Linux systemd paths plugin" do
     })
   end
 
-  it "should not populate systemd paths if systemd-path is not found" do
+  it "does not populate systemd paths if systemd-path is not found" do
     allow(plugin).to receive(:which).with("systemd-path").and_return(false)
     plugin.run
     expect(plugin[:systemd_paths]).to be(nil)

data/spec/unit/plugins/linux/uptime_spec.rb

@@ -19,29 +19,29 @@
 require "spec_helper"
 
 describe Ohai::System, "Linux plugin uptime" do
-  before(:each) do
+  before do
     @plugin = get_plugin("uptime")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
     @double_file = double("/proc/uptime", { gets: "18423 989" })
     allow(File).to receive(:open).with("/proc/uptime").and_return(@double_file)
   end
 
-  it "should set uptime_seconds to uptime" do
+  it "sets uptime_seconds to uptime" do
     @plugin.run
     expect(@plugin[:uptime_seconds]).to eq(18423)
   end
 
-  it "should set uptime to a human readable date" do
+  it "sets uptime to a human readable date" do
     @plugin.run
     expect(@plugin[:uptime]).to eq("5 hours 07 minutes 03 seconds")
   end
 
-  it "should set idletime_seconds to uptime" do
+  it "sets idletime_seconds to uptime" do
     @plugin.run
     expect(@plugin[:idletime_seconds]).to eq(989)
   end
 
-  it "should set idletime to a human readable date" do
+  it "sets idletime to a human readable date" do
     @plugin.run
     expect(@plugin[:idletime]).to eq("16 minutes 29 seconds")
   end

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Ohai::System, "Linux virtualization platform" do
   let(:plugin) { get_plugin("linux/virtualization") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
 
     # default to all requested Files not existing
@@ -396,7 +396,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     context "/proc/self/cgroup only has / mounts" do
-      before(:each) do
+      before do
         self_cgroup = <<~CGROUP
           8:blkio:/
           7:net_cls:/
@@ -539,7 +539,7 @@ describe Ohai::System, "Linux virtualization platform" do
 
     # Relevant at least starting docker 1.6.2, kernel 4.0.5 & systemd 224-1.
     # Doi not exactly know which software/version really matters here.
-    it "should set docker guest if /proc/self/cgroup exists and there are /system.slice/docker-<hexadecimal> mounts (systemd managed cgroup)" do
+    it "sets docker guest if /proc/self/cgroup exists and there are /system.slice/docker-<hexadecimal> mounts (systemd managed cgroup)" do
       self_cgroup = <<~CGROUP
         8:devices:/system.slice/docker-47341c91be8d491cb3b8a475ad5b4aef6e79bf728cbb351c384e4a6c410f172f.scope
         7:cpuset:/system.slice/docker-47341c91be8d491cb3b8a475ad5b4aef6e79bf728cbb351c384e4a6c410f172f.scope
@@ -577,7 +577,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     context "/proc/self/cgroup only has / mounts" do
-      before(:each) do
+      before do
         self_cgroup = <<~CGROUP
           8:blkio:/
           7:net_cls:/

data/spec/unit/plugins/lua_spec.rb

@@ -24,7 +24,7 @@ describe Ohai::System, "plugin lua" do
 
   let(:plugin) { get_plugin("lua") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
     @message = "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"
     allow(plugin).to receive(:shell_out).with("lua -v").and_return(mock_shell_out(0, "", @message))

data/spec/unit/plugins/mono_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Ohai::System, "plugin mono" do
   let(:plugin) { get_plugin("mono") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
     @stdout = <<~OUT
       Mono JIT compiler version 4.2.3 (Stable 4.2.3.4/832de4b Wed Mar 30 13:57:48 PDT 2016)

data/spec/unit/plugins/netbsd/hostname_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "NetBSD hostname plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:netbsd)
     allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie\n", ""))
@@ -31,12 +31,12 @@ describe Ohai::System, "NetBSD hostname plugin" do
 
   it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
 
-  it "should use #resolve_fqdn to find the fqdn" do
+  it "uses #resolve_fqdn to find the fqdn" do
     @plugin.run
     expect(@plugin[:fqdn]).to eq("katie.bethell")
   end
 
-  it "should set the domain to everything after the first dot of the fqdn" do
+  it "sets the domain to everything after the first dot of the fqdn" do
     @plugin.run
     expect(@plugin[:domain]).to eq("bethell")
   end

data/spec/unit/plugins/netbsd/kernel_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "NetBSD kernel plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("kernel")
     allow(@plugin).to receive(:collect_os).and_return(:netbsd)
     allow(@plugin).to receive(:init_kernel).and_return({})
@@ -28,7 +28,7 @@ describe Ohai::System, "NetBSD kernel plugin" do
     allow(@plugin).to receive(:shell_out).with((Ohai.abs_path( "/usr/bin/modstat" )).to_s).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
   end
 
-  it "should set the kernel_os to the kernel_name value" do
+  it "sets the kernel_os to the kernel_name value" do
     @plugin.run
     expect(@plugin[:kernel][:os]).to eq(@plugin[:kernel][:name])
   end

data/spec/unit/plugins/netbsd/platform_spec.rb

@@ -19,19 +19,19 @@
 require "spec_helper"
 
 describe Ohai::System, "NetBSD plugin platform" do
-  before(:each) do
+  before do
     @plugin = get_plugin("netbsd/platform")
     allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "NetBSD\n", ""))
     allow(@plugin).to receive(:shell_out).with("uname -r").and_return(mock_shell_out(0, "4.5\n", ""))
     allow(@plugin).to receive(:collect_os).and_return(:netbsd)
   end
 
-  it "should set platform to lowercased lsb[:id]" do
+  it "sets platform to lowercased lsb[:id]" do
     @plugin.run
     expect(@plugin[:platform]).to eq("netbsd")
   end
 
-  it "should set platform_version to lsb[:release]" do
+  it "sets platform_version to lsb[:release]" do
     @plugin.run
     expect(@plugin[:platform_version]).to eq("4.5")
   end

data/spec/unit/plugins/network_spec.rb

@@ -329,7 +329,7 @@ describe Ohai::System, "Network Plugin" do
   }
 
   describe "on linux" do
-    before(:each) do
+    before do
       @plugin = get_plugin("network")
       @plugin["network"] = basic_data["linux"]["network"]
     end
@@ -490,7 +490,7 @@ describe Ohai::System, "Network Plugin" do
             expect(@plugin["ip6address"]).to be_nil
           end
 
-          it "should warn about it" do
+          it "warns about it" do
             expect(@plugin.logger).to receive(:warn).with(/unable to detect ipaddress/).once
             expect(@plugin.logger).to receive(:trace).with(/unable to detect macaddress/).twice # for each family
             expect(@plugin.logger).to receive(:trace).with(/unable to detect ip6address/).once
@@ -853,7 +853,7 @@ describe Ohai::System, "Network Plugin" do
     # specs using network plugin data for each mocked OS (freebsd,linux,windows)
     basic_data.keys.sort.each do |os|
       describe "the #{os}::network has already set some of the {ip,mac,ip6}address attributes" do
-        before(:each) do
+        before do
           @plugin["network"] = basic_data[os]["network"]
         end
 

data/spec/unit/plugins/nodejs_spec.rb

@@ -24,7 +24,7 @@ describe Ohai::System, "plugin nodejs" do
 
   let(:plugin) { get_plugin("nodejs") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
     @stdout = "v0.8.11\n"
     allow(plugin).to receive(:shell_out).with("node -v").and_return(mock_shell_out(0, @stdout, ""))

data/spec/unit/plugins/ohai_spec.rb

@@ -21,11 +21,11 @@
 require "spec_helper"
 
 describe Ohai::System, "plugin ohai" do
-  before(:each) do
+  before do
     @plugin = get_plugin("ohai")
   end
 
-  it "should set [:chef_packages][:ohai][:version] to the current version" do
+  it "sets [:chef_packages][:ohai][:version] to the current version" do
     @plugin.run
     expect(@plugin[:chef_packages][:ohai][:version]).to eq(Ohai::VERSION)
   end

data/spec/unit/plugins/ohai_time_spec.rb

@@ -19,23 +19,23 @@
 require "spec_helper"
 
 describe Ohai::System, "plugin ohai_time" do
-  before(:each) do
+  before do
     @plugin = get_plugin("ohai_time")
   end
 
-  it "should get the current time" do
+  it "gets the current time" do
     expect(Time).to receive(:now)
     @plugin.run
   end
 
-  it "should turn the time into a floating point number" do
+  it "turns the time into a floating point number" do
     time = Time.now
     expect(time).to receive(:to_f)
     allow(Time).to receive(:now).and_return(time)
     @plugin.run
   end
 
-  it "should set ohai_time to the current time" do
+  it "sets ohai_time to the current time" do
     time = Time.now
     allow(Time).to receive(:now).and_return(time)
     @plugin.run

data/spec/unit/plugins/openbsd/hostname_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "OpenBSD hostname plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:openbsd)
     allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie\n", ""))
@@ -31,12 +31,12 @@ describe Ohai::System, "OpenBSD hostname plugin" do
 
   it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
 
-  it "should use #resolve_fqdn to find the fqdn" do
+  it "uses #resolve_fqdn to find the fqdn" do
     @plugin.run
     expect(@plugin[:fqdn]).to eq("katie.bethell")
   end
 
-  it "should set the domain to everything after the first dot of the fqdn" do
+  it "sets the domain to everything after the first dot of the fqdn" do
     @plugin.run
     expect(@plugin[:domain]).to eq("bethell")
   end

data/spec/unit/plugins/openbsd/kernel_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "OpenBSD kernel plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("kernel")
     allow(@plugin).to receive(:collect_os).and_return(:openbsd)
     allow(@plugin).to receive(:init_kernel).and_return({})
@@ -28,7 +28,7 @@ describe Ohai::System, "OpenBSD kernel plugin" do
     allow(@plugin).to receive(:shell_out).with( Ohai.abs_path( "/usr/bin/modstat" )).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
   end
 
-  it "should set the kernel_os to the kernel_name value" do
+  it "sets the kernel_os to the kernel_name value" do
     @plugin.run
     expect(@plugin[:kernel][:os]).to eq(@plugin[:kernel][:name])
   end

data/spec/unit/plugins/openbsd/platform_spec.rb

@@ -19,14 +19,14 @@
 require "spec_helper"
 
 describe Ohai::System, "OpenBSD plugin platform" do
-  before(:each) do
+  before do
     @plugin = get_plugin("openbsd/platform")
     allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "OpenBSD\n", ""))
     allow(@plugin).to receive(:shell_out).with("uname -r").and_return(mock_shell_out(0, "4.5\n", ""))
     allow(@plugin).to receive(:collect_os).and_return(:openbsd)
   end
 
-  it "should set platform_version to lsb[:release]" do
+  it "sets platform_version to lsb[:release]" do
     @plugin.run
     expect(@plugin[:platform_version]).to eq("4.5")
   end

data/spec/unit/plugins/openstack_spec.rb

@@ -23,9 +23,10 @@ describe Ohai::System, "plugin openstack" do
   let(:plugin) { get_plugin("openstack") }
   let(:default_timeout) { 2 }
 
-  before(:each) do
+  before do
+    PasswdEntry = Struct.new(:name, :uid, :gid, :dir, :shell, :gecos)
     allow(plugin).to receive(:hint?).with("openstack").and_return(false)
-    plugin[:virtualization] = { system: {} }
+    plugin[:virtualization] = { systems: {} }
   end
 
   context "when there is no relevant hint or virtualization data" do
@@ -35,17 +36,18 @@ describe Ohai::System, "plugin openstack" do
     end
   end
 
-  context "when virtualization data is Openstack" do
+  context "when virtualization data is Openstack", :unix_only do
     context "and the metadata service is not available" do
       before do
         allow(plugin).to receive(:can_socket_connect?)
           .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, default_timeout)
           .and_return(false)
-        plugin[:virtualization] = { system: { guest: "openstack" } }
+        plugin[:virtualization] = { systems: { openstack: "guest" } }
+        expect(Etc).to receive(:getpwnam).and_raise(ArgumentError)
         plugin.run
       end
 
-      it "sets openstack attribute" do
+      it "sets provider attribute to openstack" do
         expect(plugin[:openstack][:provider]).to eq("openstack")
       end
 
@@ -55,13 +57,14 @@ describe Ohai::System, "plugin openstack" do
     end
   end
 
-  context "when running on dreamhost" do
+  context "when running on dreamhost", :unix_only do
     it "sets openstack provider attribute to dreamhost" do
       plugin["etc"] = { "passwd" => { "dhc-user" => {} } }
       allow(plugin).to receive(:can_socket_connect?)
         .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, default_timeout)
         .and_return(false)
-      plugin[:virtualization] = { system: { guest: "openstack" } }
+      plugin[:virtualization] = { systems: { openstack: "guest" } }
+      expect(Etc).to receive(:getpwnam).and_return(PasswdEntry.new("dhc-user", 800, 800, "/var/www", "/bin/false", "The dreamhost user"))
       plugin.run
       expect(plugin[:openstack][:provider]).to eq("dreamhost")
     end
@@ -86,9 +89,11 @@ describe Ohai::System, "plugin openstack" do
       end
       context "when timout was set" do
         let(:override_timout) { 10 }
+
         before do
           Ohai::Config.ohai[:openstack_metadata_timeout] = override_timout
         end
+
         after do
           Ohai::Config.ohai[:openstack_metadata_timeout] = nil
         end
@@ -290,7 +295,7 @@ describe Ohai::System, "plugin openstack" do
         allow(plugin).to receive(:can_socket_connect?)
           .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, default_timeout)
           .and_return(false)
-        plugin[:virtualization] = { system: { guest: "openstack" } }
+        plugin[:virtualization] = { systems: { openstack: "guest" } }
         plugin.run
       end
 

data/spec/unit/plugins/os_spec.rb

@@ -24,7 +24,7 @@ require "spec_helper"
 ORIGINAL_CONFIG_HOST_OS = ::RbConfig::CONFIG["host_os"]
 
 describe Ohai::System, "plugin os" do
-  before(:each) do
+  before do
     @plugin = get_plugin("os")
     @plugin[:kernel] = Mash.new
     @plugin[:kernel][:release] = "kings of leon"
@@ -34,28 +34,28 @@ describe Ohai::System, "plugin os" do
     ::RbConfig::CONFIG["host_os"] = ORIGINAL_CONFIG_HOST_OS
   end
 
-  it "should set os_version to kernel_release" do
+  it "sets os_version to kernel_release" do
     @plugin.run
     expect(@plugin[:os_version]).to eq(@plugin[:kernel][:release])
   end
 
   describe "on linux" do
-    before(:each) do
+    before do
       ::RbConfig::CONFIG["host_os"] = "linux"
     end
 
-    it "should set the os to linux" do
+    it "sets the os to linux" do
       @plugin.run
       expect(@plugin[:os]).to eq("linux")
     end
   end
 
   describe "on darwin" do
-    before(:each) do
+    before do
       ::RbConfig::CONFIG["host_os"] = "darwin10.0"
     end
 
-    it "should set the os to darwin" do
+    it "sets the os to darwin" do
       @plugin.run
       expect(@plugin[:os]).to eq("darwin")
     end
@@ -73,30 +73,30 @@ describe Ohai::System, "plugin os" do
   end
 
   describe "on AIX" do
-    before(:each) do
+    before do
       @plugin = get_plugin("os")
       allow(@plugin).to receive(:collect_os).and_return(:aix)
       allow(@plugin).to receive(:shell_out).with("oslevel -s").and_return(mock_shell_out(0, "7200-00-01-1543\n", nil))
       @plugin.run
     end
 
-    it "should set the top-level os attribute" do
-      expect(@plugin[:os]).to eql(:aix)
+    it "sets the top-level os attribute" do
+      expect(@plugin[:os]).to be(:aix)
     end
 
-    it "should set the top-level os_level attribute" do
+    it "sets the top-level os_level attribute" do
       expect(@plugin[:os_version]).to eql("7200-00-01-1543")
     end
   end
 
   describe "on FreeBSD" do
-    before(:each) do
+    before do
       @plugin = get_plugin("os")
       allow(@plugin).to receive(:shell_out).with("sysctl -n kern.osreldate").and_return(mock_shell_out(0, "902001\n", ""))
       allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     end
 
-    it "should set os_version to __FreeBSD_version" do
+    it "sets os_version to __FreeBSD_version" do
       @plugin.run
       expect(@plugin[:os_version]).to eq("902001")
     end