ohai 14.15.0 → 15.0.35

data/spec/unit/plugins/network_spec.rb

@@ -16,7 +16,7 @@
 #  limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 def it_doesnt_fail
   it "doesnt fail" do
@@ -31,17 +31,17 @@ def it_populates_ipaddress_attributes
   source = caller[0]
 
   it "populates ipaddress, macaddress and ip6address" do
-    begin
-      allow(@plugin.logger).to receive(:warn)
-      expect(@plugin.logger).not_to receive(:trace).with(/^Plugin network threw exception/)
-      @plugin.run
-      %w{ ipaddress macaddress ip6address }.each do |attribute|
-        expect(@plugin).to have_key(attribute)
-      end
-    rescue Exception
-      puts "RSpec context: #{source}"
-      raise
+
+    allow(@plugin.logger).to receive(:warn)
+    expect(@plugin.logger).not_to receive(:trace).with(/^Plugin network threw exception/)
+    @plugin.run
+    %w{ ipaddress macaddress ip6address }.each do |attribute|
+      expect(@plugin).to have_key(attribute)
     end
+  rescue Exception
+    puts "RSpec context: #{source}"
+    raise
+
   end
 end
 

data/spec/unit/plugins/nodejs_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin nodejs" do
 

data/spec/unit/plugins/ohai_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin ohai" do
   before(:each) do

data/spec/unit/plugins/ohai_time_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin ohai_time" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "OpenBSD hostname plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "OpenBSD kernel plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "OpenBSD plugin platform" do
   before(:each) do

data/spec/unit/plugins/openstack_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin openstack" do
 
@@ -146,7 +146,7 @@ describe Ohai::System, "plugin openstack" do
           instance-action
           aki-id
           block-device-mapping/
-EOM
+        EOM
       end
 
       let(:metadata_values) do
@@ -156,7 +156,8 @@ EOM
           "public-keys/0/" => "openssh-key",
           "public-keys/0/openssh-key" => "SSH KEY DATA",
           "security-groups" => "default",
-          "public-ipv4" => "",
+          "public-ipv4" => "172.31.7.2",
+          "public-ipv6" => "",
           "ami-manifest-path" => "FIXME",
           "instance-type" => "opc-tester",
           "instance-id" => "i-0000162a",
@@ -246,7 +247,10 @@ EOM
         expect(plugin["openstack"]["security_groups"]).to eq(["default"])
       end
       it "reads the public_ipv4 from the metadata service" do
-        expect(plugin["openstack"]["public_ipv4"]).to eq("")
+        expect(plugin["openstack"]["public_ipv4"]).to eq("172.31.7.2")
+      end
+      it "ignore the public_ipv6 from the metadata service when empty" do
+        expect(plugin["openstack"]).not_to have_key("public_ipv6")
       end
       it "reads the ami_manifest_path from the metadata service" do
         expect(plugin["openstack"]["ami_manifest_path"]).to eq("FIXME")

data/spec/unit/plugins/os_spec.rb

@@ -19,7 +19,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 ORIGINAL_CONFIG_HOST_OS = ::RbConfig::CONFIG["host_os"]
 

data/spec/unit/plugins/packages_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin packages" do
   context "on debian" do
@@ -100,26 +100,6 @@ describe Ohai::System, "plugin packages" do
       expect(plugin[:packages]["tzdata"][:installdate]).to eq("1463486618")
       expect(plugin[:packages]["tzdata"][:arch]).to eq("noarch")
     end
-
-    it "handles multiple packages with the same name" do
-      expect(plugin[:packages]["kernel"][:version]).to eq("3.10.0")
-      expect(plugin[:packages]["kernel"][:release]).to eq("862.el7")
-      expect(plugin[:packages]["kernel"][:epoch]).to eq("0")
-      expect(plugin[:packages]["kernel"][:installdate]).to eq("1521745632")
-      expect(plugin[:packages]["kernel"][:arch]).to eq("x86_64")
-      # and now the version list:
-      expect(plugin[:packages]["kernel"]["versions"].first[:version]).to eq("3.10.0")
-      expect(plugin[:packages]["kernel"]["versions"].first[:release]).to eq("862.2.3.el7")
-      expect(plugin[:packages]["kernel"]["versions"].first[:epoch]).to eq("0")
-      expect(plugin[:packages]["kernel"]["versions"].first[:installdate]).to eq("1526310781")
-      expect(plugin[:packages]["kernel"]["versions"].first[:arch]).to eq("x86_64")
-      expect(plugin[:packages]["kernel"]["versions"].last[:version]).to eq("3.10.0")
-      expect(plugin[:packages]["kernel"]["versions"].last[:release]).to eq("862.el7")
-      expect(plugin[:packages]["kernel"]["versions"].last[:epoch]).to eq("0")
-      expect(plugin[:packages]["kernel"]["versions"].last[:installdate]).to eq("1521745632")
-      expect(plugin[:packages]["kernel"]["versions"].last[:arch]).to eq("x86_64")
-
-    end
   end
 
   context "on arch" do

data/spec/unit/plugins/passwd_spec.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin etc", :unix_only do
   before(:each) do

data/spec/unit/plugins/perl_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin perl" do
   let(:plugin) { get_plugin("perl") }

data/spec/unit/plugins/php_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin php" do
   let(:plugin) { get_plugin("php") }
@@ -29,7 +29,7 @@ describe Ohai::System, "plugin php" do
       PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
       Copyright (c) 1997-2006 The PHP Group
       Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
-OUT
+    OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
   end
 
@@ -49,7 +49,7 @@ OUT
       Copyright (c) 1997-2016 The PHP Group
       Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
           with Zend OPcache v7.0.6-dev, Copyright (c) 1999-2016, by Zend Technologies
-OUT
+    OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
     expect(plugin.languages[:php][:version]).to eql("7.0.4-7ubuntu2.1")
@@ -66,7 +66,7 @@ OUT
       PHP 5.3.27 with Suhosin-Patch (cli) (built: Aug 30 2013 04:30:30)
       Copyright (c) 1997-2013 The PHP Group
       Zend Engine v2.3.0, Copyright (c) 1998-2013 Zend Technologies
-OUT
+    OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
     expect(plugin.languages[:php][:builddate]).to eql("Aug 30 2013 04:30:30")
@@ -77,7 +77,7 @@ OUT
       PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
       Copyright (c) 1997-2006 The PHP Group
       Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
-OUT
+    OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
     expect(plugin.languages[:php]).not_to have_key(:zend_opcache_version)
@@ -89,7 +89,7 @@ OUT
       Copyright (c) 1997-2014 The PHP Group
       Zend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies
           with Zend OPcache v7.0.3, Copyright (c) 1999-2014, by Zend Technologies
-OUT
+    OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
     expect(plugin.languages[:php][:zend_opcache_version]).to eql("7.0.3")

data/spec/unit/plugins/platform_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin platform" do
   before(:each) do

data/spec/unit/plugins/powershell_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin powershell" do
   let(:plugin) { get_plugin("powershell") }
@@ -42,7 +42,7 @@ describe Ohai::System, "plugin powershell" do
       PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
       PSRemotingProtocolVersion      2.2
 
-END
+    END
     compat_version_array = ["1.0", "2.0", "3.0", "4.0"]
 
     allow(plugin).to receive(:shell_out).with(anything).and_return(mock_shell_out(0, v4_output, ""))
@@ -61,7 +61,7 @@ END
     error_output = <<~END
       'powershell.exe' is not recognized as an internal or external command,
       operable program or batch file.
-END
+    END
 
     allow(plugin).to receive(:shell_out).with(anything).and_return(mock_shell_out(1, error_output, ""))
     plugin.run

data/spec/unit/plugins/python_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin python" do
   let(:stdout) { "2.5.2 (r252:60911, Jan  4 2009, 17:40:26)\n[GCC 4.3.2]\n" }

data/spec/unit/plugins/rackspace_spec.rb

@@ -16,7 +16,7 @@
 #
 
 require "resolv"
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin rackspace" do
   let(:plugin) { get_plugin("rackspace") }
@@ -137,7 +137,7 @@ describe Ohai::System, "plugin rackspace" do
         server_id = "21301000"
         created_at = "2012-12-06T22:08:16Z"
         region = "dfw"
-OUT
+      OUT
       allow(plugin).to receive(:shell_out).with("xenstore-ls vm-data/provider_data").and_return(mock_shell_out(0, provider_data, ""))
       plugin.run
       expect(plugin[:rackspace][:region]).to eq("dfw")

data/spec/unit/plugins/root_group_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "root_group" do
   before(:each) do
@@ -55,16 +55,6 @@ describe Ohai::System, "root_group" do
       end
     end
 
-    describe "platform hpux with sys group" do
-      before(:each) do
-        allow(@pwnam).to receive(:gid).and_return(3)
-        allow(@grgid).to receive(:name).and_return("sys")
-      end
-      it "should have a root_group of sys" do
-        @plugin.run
-        expect(@plugin[:root_group]).to eq("sys")
-      end
-    end
     describe "platform aix with system group" do
       before(:each) do
         allow(@grgid).to receive(:name).and_return("system")

data/spec/unit/plugins/ruby_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 ruby_bin = File.join(::RbConfig::CONFIG["bindir"], ::RbConfig::CONFIG["ruby_install_name"])
 

data/spec/unit/plugins/rust_spec.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin rust" do
   let(:stdout) { "rustc 1.0.0-nightly (29bd9a06e 2015-01-20 23:03:09 +0000)" }

data/spec/unit/plugins/scala_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin scala" do
 

data/spec/unit/plugins/scsi_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "lsscsi plugin" do
   let(:plugin) { get_plugin("scsi") }
@@ -29,7 +29,7 @@ describe Ohai::System, "lsscsi plugin" do
       [6:2:2:0]    disk    LSI      MR9286CV-8e      3.41  /dev/sdd
       [6:2:3:0]    disk    LSI      MR9286CV-8e      3.41  /dev/sde
       [6:2:4:0]    disk    LSI      MR9286CV-8e      3.41  /dev/sdf
-LSSCSI
+    LSSCSI
     allow(plugin).to receive(:shell_out).with("lsscsi").and_return(
       mock_shell_out(0, @stdout, ""))
     plugin.run

data/spec/unit/plugins/shard_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "digest/md5"
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "shard plugin" do
   let(:plugin) { get_plugin("shard") }

data/spec/unit/plugins/shells_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin shells" do
   let(:plugin) { get_plugin("shells") }

data/spec/unit/plugins/softlayer_spec.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin softlayer" do
   let(:plugin) { get_plugin("softlayer") }

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

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Solaris2.X cpu plugin" do
   before(:each) do
@@ -441,7 +441,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         cpu_info:15:cpu_info15:supported_frequencies_Hz 2925945978
         cpu_info:15:cpu_info15:supported_max_cstates    1
         cpu_info:15:cpu_info15:vendor_id        GenuineIntel
-END
+      END
       allow(@plugin).to receive(:shell_out).with("kstat -p cpu_info").and_return(mock_shell_out(0, kstatinfo_output, ""))
       @plugin.run
     end
@@ -2807,7 +2807,7 @@ END
         cpu_info:127:cpu_info127:state	off-line
         cpu_info:127:cpu_info127:state_begin	1430258903
         cpu_info:127:cpu_info127:supported_frequencies_Hz	1648762500
-END
+      END
       allow(@plugin).to receive(:shell_out).with("kstat -p cpu_info").and_return(mock_shell_out(0, kstatinfo_output, ""))
       @plugin.run
     end