ohai 14.15.0 → 15.0.35

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

@@ -16,7 +16,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, "Aix plugin platform" do
   before(:each) do

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

@@ -16,7 +16,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, "Aix plugin uptime" do
 

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

@@ -16,7 +16,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, "AIX virtualization plugin" do
 
@@ -244,7 +244,7 @@ describe Ohai::System, "AIX virtualization plugin" do
         /dev/nvram         pseudo                               EXPORTED
 
 
-LSWPAR_L
+      LSWPAR_L
 
     end
 

data/spec/unit/plugins/azure_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "open-uri"
 
 describe Ohai::System, "plugin azure" do

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

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "BSD filesystem plugin" do
   let(:plugin) { get_plugin("filesystem") }
@@ -35,14 +35,14 @@ describe Ohai::System, "BSD filesystem plugin" do
         Filesystem  1K-blocks    Used   Avail Capacity  Mounted on
         /dev/ada0p2   9637788 3313504 5553264    37%    /
         devfs               1       1       0   100%    /dev
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df").and_return(mock_shell_out(0, @stdout, ""))
 
       @inode_stdout = <<~DFI
         Filesystem  512-blocks    Used   Avail Capacity iused  ifree %iused  Mounted on
         /dev/ada0p2   15411832 5109256 9069632    36%  252576 790750   24%   /
         devfs                2       2       0   100%       0      0  100%   /dev
-DFI
+      DFI
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
     end
 
@@ -106,7 +106,7 @@ DFI
       @stdout = <<~MOUNT
         /dev/ada0p2 on / (ufs, local, journaled soft-updates)
         devfs on /dev (devfs, local, multilabel)
-MOUNT
+      MOUNT
       allow(plugin).to receive(:shell_out).with("mount -l").and_return(mock_shell_out(0, @stdout, ""))
     end
 

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "BSD virtualization plugin" do
   let(:plugin) { get_plugin("bsd/virtualization") }
@@ -78,7 +78,7 @@ describe Ohai::System, "BSD virtualization plugin" do
         Id Refs Address Size Name
         1 40 0xffffffff80100000 d20428 kernel
         7 3 0xffffffff81055000 41e88 vboxguest.ko
-OUT
+      OUT
       allow(plugin).to receive(:shell_out).with((Ohai.abs_path("/sbin/kldstat")).to_s).and_return(mock_shell_out(0, @vbox_guest, ""))
     end
 
@@ -96,7 +96,7 @@ OUT
         Id Refs Address Size Name
         1 40 0xffffffff80100000 d20428 kernel
         7 3 0xffffffff81055000 41e88 vboxdrv.ko
-OUT
+      OUT
       allow(plugin).to receive(:shell_out).with("/sbin/kldstat").and_return(mock_shell_out(0, @stdout, ""))
     end
 

data/spec/unit/plugins/c_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 C_GCC = <<~EOF.freeze
   Using built-in specs.
@@ -70,14 +70,6 @@ C_SUN = <<~EOF.freeze
   cc: Sun C 5.8 Patch 121016-06 2007/08/01
 EOF
 
-C_HPUX = <<~EOF.freeze
-  /opt/ansic/bin/cc:
-          $Revision: 92453-07 linker linker crt0.o B.11.47 051104 $
-          LINT B.11.11.16 CXREF B.11.11.16
-          HP92453-01 B.11.11.16 HP C Compiler
-           $ PATCH/11.00:PHCO_27774  Oct  3 2002 09:45:59 $
-EOF
-
 describe Ohai::System, "plugin c" do
 
   let(:plugin) { get_plugin("c") }
@@ -131,43 +123,6 @@ describe Ohai::System, "plugin c" do
     end
 
   end
-
-  context "on HPUX" do
-    before(:each) do
-      allow(plugin).to receive(:collect_os).and_return(:hpux)
-      allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(0, C_HPUX, ""))
-    end
-
-    # hpux cc
-    it "gets the cc version from running what cc" do
-      expect(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(0, C_HPUX, ""))
-      plugin.run
-    end
-
-    it "sets languages[:c][:hpcc][:version]" do
-      plugin.run
-      expect(plugin.languages[:c][:hpcc][:version]).to eql("B.11.11.16")
-    end
-
-    it "sets languages[:c][:hpcc][:description]" do
-      plugin.run
-      expect(plugin.languages[:c][:hpcc][:description]).to eql("HP92453-01 B.11.11.16 HP C Compiler")
-    end
-
-    it "does not set the languages[:c][:hpcc] tree up if cc command exits nonzero" do
-      allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(1, "", ""))
-      plugin.run
-      expect(plugin[:languages][:c]).not_to have_key(:hpcc)
-    end
-
-    it "does not set the languages[:c][:hpcc] tree up if cc command fails" do
-      allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_raise(Ohai::Exceptions::Exec)
-      plugin.run
-      expect(plugin[:languages][:c]).not_to have_key(:hpcc)
-      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
-    end
-  end
-
   context "on Darwin" do
     before(:each) do
       allow(plugin).to receive(:shell_out).with("/usr/bin/xcode-select -p").and_return(mock_shell_out(0, "", ""))
@@ -381,12 +336,5 @@ describe Ohai::System, "plugin c" do
       plugin.run
       expect(plugin[:languages][:c]).not_to have_key(:sunpro)
     end
-
-    it "does not set the languages[:c][:sunpro] tree if the corresponding cc command fails on hpux" do
-      hpux_error_message = "cc: warning 901: unknown option: `-flags': use +help for online documentation.\ncc: HP C/aC++ B3910B A.06.25 [Nov 30 2009]"
-      allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", hpux_error_message))
-      plugin.run
-      expect(plugin[:languages][:c]).not_to have_key(:sunpro)
-    end
   end
 end

data/spec/unit/plugins/chef_spec.rb

@@ -19,7 +19,7 @@
 #
 
 begin
-  require_relative "../../spec_helper.rb"
+  require "spec_helper"
   require "chef/version"
 
   describe Ohai::System, "plugin chef" do

data/spec/unit/plugins/cloud_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "ipaddr"
 
 describe "CloudAttrs object" do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Darwin cpu plugin" do
   before(:each) do
@@ -75,7 +75,7 @@ describe Ohai::System, "Darwin cpu plugin" do
       machdep.cpu.vendor: GenuineIntel
       machdep.cpu.max_ext: 2147483656
       machdep.cpu.max_basic: 13
-CTL
+    CTL
 
     allow(@plugin).to receive(:collect_os).and_return(:darwin)
     allow(@plugin).to receive(:shell_out).with("sysctl hw machdep").and_return(mock_shell_out(0, @stdout, ""))

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "darwin filesystem plugin" do
   let(:plugin) { get_plugin("filesystem") }
@@ -37,7 +37,7 @@ describe Ohai::System, "darwin filesystem plugin" do
         map -hosts                    0         0         0   100%        0        0  100%   /net
         map -static                   0         0         0   100%        0        0  100%   /mobile_symbol
         deweyfs@osxfuse0              0         0         0   100%        0        0  100%   /mnt/dewey
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, @stdout, ""))
     end
 
@@ -77,7 +77,7 @@ DF
         map -hosts on /net (autofs, nosuid, automounted, nobrowse)
         map -static on /mobile_symbol (autofs, automounted, nobrowse)
         deweyfs@osxfuse0 on /mnt/dewey (osxfusefs, synchronous, nobrowse)
-MOUNT
+      MOUNT
       allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, ""))
     end
 
@@ -105,7 +105,7 @@ MOUNT
         map -static                   0         0         0   100%        0        0  100%   /mobile_symbol
         deweyfs@osxfuse0              0         0         0   100%        0        0  100%   /mnt/dewey
         /dev/disk0s2          488555536 313696448 174347088    65% 39276054 21793386 64%   /another/mountpoint
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, @dfstdout, ""))
     end
 
@@ -127,7 +127,7 @@ DF
         deweyfs@osxfuse0              0         0         0   100%        0        0  100%   /mnt/dewey
         /dev/disk0s3          488555536 313696448 174347088    65% 39276054 21793386 64% /mnt
         /dev/disk0s4          488555536 313696448 174347088    65% 39276054 21793386 64% /mnt
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, @dfstdout, ""))
     end
 

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

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
-require_relative "hardware_system_profiler_output.rb"
+require "spec_helper"
+require_relative "hardware_system_profiler_output"
 
 describe Ohai::System, "Darwin hardware plugin", :unix_only do
   let(:plugin) { get_plugin("darwin/hardware") }

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

@@ -287,7 +287,7 @@ module HardwareSystemProfilerOutput
       </dict>
     </array>
     </plist>
-HARDWARE_OUTPUT
+  HARDWARE_OUTPUT
 
   STORAGE = <<~STORAGE_OUTPUT.freeze
     <?xml version="1.0" encoding="UTF-8"?>
@@ -598,7 +598,7 @@ HARDWARE_OUTPUT
       </dict>
     </array>
     </plist>
-STORAGE_OUTPUT
+  STORAGE_OUTPUT
 
   POWER = <<~POWER_OUTPUT.freeze
     <?xml version="1.0" encoding="UTF-8"?>
@@ -1105,6 +1105,6 @@ STORAGE_OUTPUT
       </dict>
     </array>
     </plist>
-POWER_OUTPUT
+  POWER_OUTPUT
 
 end

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

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

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

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

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

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

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

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

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

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

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

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

data/spec/unit/plugins/dmi_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 # NOTE: These data lines must be prefixed with one or two tabs, not spaces.
 DMI_OUT = <<~EOS.freeze

data/spec/unit/plugins/docker_spec.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 docker_output = <<~EOF
   {"ID":"KZET:VDFN:2V2G:JS5Z:HAKO:SOGI:AFSZ:HDMT:GVEM:V2NT:DUSW:J3Z6","Containers":11,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":11,"Images":30,"Driver":"overlay2","DriverStatus":[["Backing Filesystem","extfs"],["Supports d_type","true"],["Native Overlay Diff","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","ipvlan","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":21,"OomKillDisable":true,"NGoroutines":39,"SystemTime":"2018-02-15T19:12:40.214106068Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":2,"KernelVersion":"4.9.60-linuxkit-aufs","OperatingSystem":"Docker for Mac","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":[],"AllowNondistributableArtifactsHostnames":[],"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":[],"Secure":true,"Official":true}},"Mirrors":[]},"NCPU":4,"MemTotal":2095816704,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"docker.for.mac.http.internal:3128","HttpsProxy":"docker.for.mac.http.internal:3129","NoProxy":"","Name":"linuxkit-025000000001","Labels":[],"ExperimentalBuild":true,"ServerVersion":"17.12.0-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"89623f28b87a6004d4b785663257362d1658a729","Expected":"89623f28b87a6004d4b785663257362d1658a729"},"RuncCommit":{"ID":"b2567b37d7b75eb4cf325b77297b140ea686ce8f","Expected":"b2567b37d7b75eb4cf325b77297b140ea686ce8f"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=seccomp,profile=default"]}

data/spec/unit/plugins/ec2_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "open-uri"
 require "base64"
 

data/spec/unit/plugins/elixir_spec.rb

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

data/spec/unit/plugins/erlang_spec.rb

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

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "open-uri"
 
 describe Ohai::System, "plugin eucalyptus" do

data/spec/unit/plugins/fail_spec.rb

@@ -17,17 +17,17 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 tmp = ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp"
 
 shared_examples "a v7 loading failure" do
   before(:all) do
-    begin
-      Dir.mkdir("#{tmp}/plugins")
-    rescue Errno::EEXIST
+
+    Dir.mkdir("#{tmp}/plugins")
+  rescue Errno::EEXIST
       # ignore
-    end
+
   end
 
   before(:each) do
@@ -41,11 +41,11 @@ shared_examples "a v7 loading failure" do
   end
 
   after(:all) do
-    begin
-      Dir.delete("#{tmp}/plugins")
-    rescue
+
+    Dir.delete("#{tmp}/plugins")
+  rescue
       # ignore
-    end
+
   end
 
   before(:each) do
@@ -67,11 +67,11 @@ end
 
 shared_examples "a v7 loading success" do
   before(:all) do
-    begin
-      Dir.mkdir("#{tmp}/plugins")
-    rescue Errno::EEXIST
+
+    Dir.mkdir("#{tmp}/plugins")
+  rescue Errno::EEXIST
       # ignore
-    end
+
   end
 
   before(:each) do
@@ -85,11 +85,11 @@ shared_examples "a v7 loading success" do
   end
 
   after(:all) do
-    begin
-      Dir.delete("#{tmp}/plugins")
-    rescue
+
+    Dir.delete("#{tmp}/plugins")
+  rescue
       # ignore
-    end
+
   end
 
   before(:each) do
@@ -110,11 +110,11 @@ end
 
 shared_examples "a v7 run failure" do
   before(:all) do
-    begin
-      Dir.mkdir("#{tmp}/plugins")
-    rescue Errno::EEXIST
+
+    Dir.mkdir("#{tmp}/plugins")
+  rescue Errno::EEXIST
       # ignore
-    end
+
   end
 
   before(:each) do
@@ -128,11 +128,11 @@ shared_examples "a v7 run failure" do
   end
 
   after(:all) do
-    begin
-      Dir.delete("#{tmp}/plugins")
-    rescue
+
+    Dir.delete("#{tmp}/plugins")
+  rescue
       # ignore
-    end
+
   end
 
   before(:each) do
@@ -156,20 +156,20 @@ describe "when using DSL commands outside Ohai.plugin block" do
     provides "fail"
     Ohai.plugin do
     end
-EOF
+  EOF
 
   failstr2 = <<~EOF
     depends "fail"
     Ohai.plugin do
     end
-EOF
+  EOF
 
   failstr3 = <<~EOF
     collect_data do
     end
     Ohai.plugin do
     end
-EOF
+  EOF
 
   it_behaves_like "a v7 loading failure" do
     let(:failstr) { failstr1 }