ohai 8.8.1 → 8.9.0

data/spec/unit/plugins/azure_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/bsd/filesystem_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matthew Kent (<mkent@magoazul.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2011-2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,6 +1,6 @@
 #
-# Author:: Bryan McLellan <btm@opscode.com>
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Bryan McLellan <btm@chef.io>
+# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/chef_spec.rb

@@ -1,16 +1,16 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Tollef Fog Heen <tfheen@err.no>
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # Copyright:: Copyright (c) 2010 Tollef Fog Heen <tfheen@err.no>
 # 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.
@@ -20,9 +20,9 @@
 
 begin
   require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-  
+
   require 'chef/version'
-  
+
   describe Ohai::System, "plugin chef" do
     before(:each) do
       @plugin = get_plugin("chef")
@@ -32,10 +32,10 @@ begin
       @plugin.run
       expect(@plugin[:chef_packages][:chef][:version]).to eq(Chef::VERSION)
     end
-  
+
     pending "would set [:chef_packages][:chef][:version] if chef was available", :unless => defined?(Chef)
   end
-  
+
 rescue LoadError
   # the chef module is not available, ignoring.
 

data/spec/unit/plugins/darwin/cpu_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nathan L Smith (<nlloyds@gmail.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,7 @@ describe Ohai::System, "Darwin cpu plugin" do
   before(:each) do
     @plugin = get_plugin("darwin/cpu")
     allow(@plugin).to receive(:collect_os).and_return(:darwin)
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.packages").and_return(mock_shell_out(0, "1", ""))
     allow(@plugin).to receive(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "4", ""))
     allow(@plugin).to receive(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "8", ""))
     allow(@plugin).to receive(:shell_out).with("sysctl -n hw.cpufrequency").and_return(mock_shell_out(0, "2300000000", ""))
@@ -35,12 +36,16 @@ describe Ohai::System, "Darwin cpu plugin" do
     @plugin.run
   end
 
+  it "should set cpu[:cores] to 4" do
+    expect(@plugin[:cpu][:cores]).to eq(4)
+  end
+
   it "should set cpu[:total] to 8" do
     expect(@plugin[:cpu][:total]).to eq(8)
   end
 
-  it "should set cpu[:real] to 4" do
-    expect(@plugin[:cpu][:real]).to eq(4)
+  it "should set cpu[:real] to 1" do
+    expect(@plugin[:cpu][:real]).to eq(1)
   end
 
   it "should set cpu[:mhz] to 2300" do

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

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # 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.

data/spec/unit/plugins/darwin/memory_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Patrick Collins (<pat@burned.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/darwin/network_spec.rb

@@ -1,6 +1,6 @@
 #
 #  Author:: Alan Harper <alan@aussiegeek.net>
-#  Copyright:: Copyright (c) 2012 Opscode, Inc.
+#  Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
 #  License:: Apache License, Version 2.0
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # 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.
@@ -36,12 +36,12 @@ describe Ohai::System, "Darwin plugin platform" do
     @plugin.run
     expect(@plugin[:platform]).to eq("mac_os_x")
   end
-  
+
   it "should set platform_version to ProductVersion" do
     @plugin.run
     expect(@plugin[:platform_version]).to eq("10.5.5")
   end
-  
+
   it "should set platform_build to BuildVersion" do
     @plugin.run
     expect(@plugin[:platform_build]).to eq("9F33")

data/spec/unit/plugins/darwin/system_profiler_output.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 module SystemProfilerOutput
 Mini = <<end_output

data/spec/unit/plugins/darwin/system_profiler_spec.rb

@@ -1,14 +1,14 @@
 #
-# Author:: Paul Mooring (<paul@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Paul Mooring (<paul@chef.io>)
+# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
 # 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.

data/spec/unit/plugins/ec2_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
-# Author:: Christopher Brown (cb@opscode.com)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Christopher Brown (cb@chef.io)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,7 +51,7 @@ describe Ohai::System, "plugin ec2" do
     end
 
 context "with common metadata paths" do
-   let(:paths) do 
+   let(:paths) do
      { "meta-data/" => "instance_type\nami_id\nsecurity-groups",
        "meta-data/instance_type" => "c1.medium",
        "meta-data/ami_id" => "ami-5d2dc934",

data/spec/unit/plugins/erlang_spec.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Theodore Nordsieck (<theo@opscode.com>)
-# Copyright:: Copyright (c) 2008-2013 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Theodore Nordsieck (<theo@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
-# Author:: Christopher Brown (cb@opscode.com)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Christopher Brown (cb@chef.io)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/fail_spec.rb

@@ -1,15 +1,15 @@
 #
 # Author:: Toomas Pelberg (toomas.pelberg@playtech.com>)
-# Author:: Claire McQuin (claire@opscode.com)
-# Copyright:: Copyright (c) 2011, 2013 Opscode, Inc.
+# Author:: Claire McQuin (claire@chef.io)
+# Copyright:: Copyright (c) 2011, 2013-2016 Chef Software, Inc.
 # 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.
@@ -241,7 +241,7 @@ end
 
 describe "when using nonexistent DSL commands in Ohai.plugin block" do
   failstr = "Ohai.plugin do\n\tcreates \"fail\"\nend\n"
-  
+
   it_behaves_like "a v7 loading failure" do
     let(:failstr) { failstr }
   end
@@ -266,7 +266,7 @@ Ohai.plugin do
   end
 end
 EOF
-  
+
   it_behaves_like "a v7 loading success" do
     let(:failstr) { failstr1 }
   end

data/spec/unit/plugins/freebsd/cpu_spec.rb

@@ -22,7 +22,6 @@ describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
   before(:each) do
     @plugin = get_plugin("freebsd/cpu")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
-    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.ncpu").and_return(mock_shell_out(0, "2", ""))
     @double_file = double("/var/run/dmesg.boot")
     allow(@double_file).to receive(:each).
       and_yield('CPU: Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz (2793.59-MHz K8-class CPU)').
@@ -32,7 +31,13 @@ describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
       and_yield('  AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>').
       and_yield('  AMD Features2=0x21<LAHF,ABM>').
       and_yield('  Structured Extended Features=0x2000<NFPUSG>').
-      and_yield('  TSC: P-state invariant')
+      and_yield('  TSC: P-state invariant').
+      and_yield('real memory  = 1073676288 (1023 MB)').
+      and_yield('avail memory = 1010253824 (963 MB)').
+      and_yield('Event timer "LAPIC" quality 400').
+      and_yield('ACPI APIC Table: <VBOX   VBOXAPIC>').
+      and_yield('FreeBSD/SMP: Multiprocessor System Detected: 16 CPUs').
+      and_yield('FreeBSD/SMP: 2 package(s) x 4 core(s) x 2 SMT threads')
     allow(File).to receive(:open).with("/var/run/dmesg.boot").and_return(@double_file)
   end
 
@@ -71,9 +76,19 @@ describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
     expect(@plugin[:cpu][:stepping]).to eq("1")
   end
 
-  it "detects CPU total" do
+  it "detects real CPUs" do
+    @plugin.run
+    expect(@plugin[:cpu][:real]).to eq(2)
+  end
+
+  it "detects total real CPU cores" do
+    @plugin.run
+    expect(@plugin[:cpu][:cores]).to eq(8)
+  end
+
+  it "detects total HT CPU cores" do
     @plugin.run
-    expect(@plugin[:cpu][:total]).to eq(2)
+    expect(@plugin[:cpu][:total]).to eq(16)
   end
 
 end

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

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # 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.

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

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # 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.
@@ -28,12 +28,12 @@ describe Ohai::System, "FreeBSD plugin platform" do
   end
 
   it "should set platform to lowercased lsb[:id]" do
-    @plugin.run        
+    @plugin.run
     expect(@plugin[:platform]).to eq("freebsd")
   end
-  
+
   it "should set platform_version to lsb[:release]" do
     @plugin.run
     expect(@plugin[:platform_version]).to eq("7.1")
   end
-end  
+end

data/spec/unit/plugins/hostname_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/init_package_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,11 +26,12 @@ describe Ohai::System, "Init package" do
   }
 
   let(:proc1_content) { "init\n" }
+  let(:proc1_exists) { true }
   let(:proc_1_file_path) { "/proc/1/comm" }
   let(:proc_1_file) { double(proc_1_file_path, :gets => proc1_content) }
 
   before(:each) do
-    allow(File).to receive(:exists?).with(proc_1_file_path).and_return(true)
+    allow(File).to receive(:exists?).with(proc_1_file_path).and_return(proc1_exists)
     allow(File).to receive(:open).with(proc_1_file_path).and_return(proc_1_file)
   end
 
@@ -47,4 +48,13 @@ describe Ohai::System, "Init package" do
       expect(plugin[:init_package]).to eq("systemd")
     end
   end
+
+  describe "when /proc/1/comm doesn't exist" do
+    let(:proc1_exists) { false }
+
+    it "should set init_package to init" do
+      plugin.run
+      expect(plugin[:init_package]).to eq("init")
+    end
+  end
 end