ohai 8.26.1 → 13.0.0

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

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

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "darwin filesystem plugin" do
   let (:plugin) { get_plugin("darwin/filesystem") }
@@ -27,6 +27,11 @@ describe Ohai::System, "darwin filesystem plugin" do
     allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
   end
 
+  it "sets both filesystem and filesystem2 attributes" do
+    plugin.run
+    expect(plugin[:filesystem]).to eq(plugin[:filesystem2])
+  end
+
   describe "when gathering filesystem usage data from df" do
     before(:each) do
       @stdout = <<-DF
@@ -48,22 +53,23 @@ DF
 
     it "should set size to value from df -i" do
       plugin.run
-      expect(plugin[:filesystem]["/dev/disk0s2"][:kb_size]).to eq(244277768)
-      expect(plugin[:filesystem]["/dev/disk0s2"][:kb_used]).to eq(156848224)
-      expect(plugin[:filesystem]["/dev/disk0s2"][:kb_available]).to eq(87173544)
-      expect(plugin[:filesystem]["/dev/disk0s2"][:percent_used]).to eq("65%")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:kb_size]).to eq("244277768")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:kb_used]).to eq("156848224")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:kb_available]).to eq("87173544")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:percent_used]).to eq("65%")
     end
 
-    it "should set mount to value from df -i" do
+    it "should set device and mount to value from df -i" do
       plugin.run
-      expect(plugin[:filesystem]["/dev/disk0s2"][:mount]).to eq("/")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:mount]).to eq("/")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:device]).to eq("/dev/disk0s2")
     end
 
     it "should set inode info to value from df -i" do
       plugin.run
-      expect(plugin[:filesystem]["/dev/disk0s2"][:total_inodes]).to eq("61069440")
-      expect(plugin[:filesystem]["/dev/disk0s2"][:inodes_used]).to eq("39276054")
-      expect(plugin[:filesystem]["/dev/disk0s2"][:inodes_available]).to eq("21793386")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:total_inodes]).to eq("61069440")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:inodes_used]).to eq("39276054")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:inodes_available]).to eq("21793386")
     end
   end
 
@@ -87,9 +93,52 @@ MOUNT
 
     it "should set values from mount" do
       plugin.run
-      expect(plugin[:filesystem]["/dev/disk0s2"][:mount]).to eq("/")
-      expect(plugin[:filesystem]["/dev/disk0s2"][:fs_type]).to eq("hfs")
-      expect(plugin[:filesystem]["/dev/disk0s2"][:mount_options]).to eq(%w{local journaled})
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:mount]).to eq("/")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:fs_type]).to eq("hfs")
+      expect(plugin[:filesystem]["by_pair"]["/dev/disk0s2,/"][:mount_options]).to eq(%w{local journaled})
+    end
+  end
+
+  describe "when gathering filesystem data with devices mounted more than once" do
+    before(:each) do
+      @dfstdout = <<-DF
+Filesystem           512-blocks      Used Available Capacity  iused    ifree %iused  Mounted on
+/dev/disk0s2          488555536 313696448 174347088    65% 39276054 21793386   64%   /
+devfs                       385       385         0   100%      666        0  100%   /dev
+map /etc/auto.direct          0         0         0   100%        0        0  100%   /mnt/vol
+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
+/dev/disk0s2          488555536 313696448 174347088    65% 39276054 21793386 64%   /another/mountpoint
+DF
+      allow(plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, @dfstdout, ""))
+    end
+
+    it "should provide a devices view with all mountpoints" do
+      plugin.run
+      expect(plugin[:filesystem]["by_device"]["/dev/disk0s2"][:mounts]).to eq(["/", "/another/mountpoint"])
+    end
+  end
+
+  describe "when gathering filesystem data with double-mounts" do
+    before(:each) do
+      @dfstdout = <<-DF
+Filesystem           512-blocks      Used Available Capacity  iused    ifree %iused  Mounted on
+/dev/disk0s2          488555536 313696448 174347088    65% 39276054 21793386   64%   /
+devfs                       385       385         0   100%      666        0  100%   /dev
+map /etc/auto.direct          0         0         0   100%        0        0  100%   /mnt/vol
+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
+/dev/disk0s3          488555536 313696448 174347088    65% 39276054 21793386 64% /mnt
+/dev/disk0s4          488555536 313696448 174347088    65% 39276054 21793386 64% /mnt
+DF
+      allow(plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, @dfstdout, ""))
+    end
+
+    it "should provide a mounts view with all devices" do
+      plugin.run
+      expect(plugin[:filesystem]["by_mountpoint"]["/mnt"][:devices]).to eq(["/dev/disk0s3", "/dev/disk0s4"])
     end
   end
 end

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

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

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 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 File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 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 File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 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 File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 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 File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Darwin plugin platform" do
   before(:each) do

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

@@ -16,15 +16,8 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
-require File.expand_path("#{File.dirname(__FILE__)}/system_profiler_output.rb")
-
-begin
-  require "plist"
-rescue LoadError => e
-  puts "The darwin systemprofile plugin spec tests will fail without the 'plist' library/gem.\n\n"
-  raise e
-end
+require_relative "../../../spec_helper.rb"
+require_relative "system_profiler_output.rb"
 
 describe Ohai::System, "Darwin system_profiler plugin", :unix_only do
   before(:each) do

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

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

data/spec/unit/plugins/digital_ocean_spec.rb

@@ -1,4 +1,5 @@
 #
+# Author:: Dylan Page (<dpage@digitalocean.com>)
 # Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
 # License:: Apache License, Version 2.0
 #
@@ -15,12 +16,10 @@
 # limitations under the License.
 #
 
-require "ipaddress"
 require "spec_helper"
 
 describe Ohai::System, "plugin digital_ocean" do
   let(:plugin) { get_plugin("digital_ocean") }
-  let(:digitalocean_path) { "/etc/digitalocean" }
   let(:hint) do
     {
       "droplet_id" => 12345678,
@@ -35,141 +34,71 @@ describe Ohai::System, "plugin digital_ocean" do
     }
   end
 
-  before do
-    plugin[:network] = {
-      "interfaces" => {
-        "eth0" => {
-          "addresses" => {
-            "00:D3:AD:B3:3F:00" => {
-              "family" => "lladdr",
-            },
-            "1.2.3.4" => {
-              "netmask" => "255.255.255.0",
-            },
-            "2400:6180:0000:00d0:0000:0000:0009:7001" => {},
-          },
-        },
-      },
-    }
-
-    allow(plugin).to receive(:hint?).with("digital_ocean").and_return(hint)
+  before(:each) do
+    allow(plugin).to receive(:hint?).with("digital_ocean").and_return(false)
   end
 
   shared_examples_for "!digital_ocean" do
-    before(:each) do
-      plugin.run
-    end
-
-    it "does not create the digital_ocean mash" do
+    it "should NOT attempt to fetch the digital_ocean metadata" do
+      expect(plugin).not_to receive(:http_client)
       expect(plugin[:digital_ocean]).to be_nil
+      plugin.run
     end
   end
 
-  shared_examples_for "digital_ocean_networking" do
-    it "creates the networks attribute" do
-      expect(plugin[:digital_ocean][:networks]).not_to be_nil
+  shared_examples_for "digital_ocean" do
+    before(:each) do
+      @http_client = double("Net::HTTP client")
+      allow(plugin).to receive(:http_client).and_return(@http_client)
+      allow(IO).to receive(:select).and_return([[], [1], []])
+      t = double("connection")
+      allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
+      allow(Socket).to receive(:new).and_return(t)
+      allow(Socket).to receive(:pack_sockaddr_in).and_return(nil)
     end
 
-    it "pulls ip addresses from the network interfaces" do
-      expect(plugin[:digital_ocean][:networks][:v4]).to eq([{ "ip_address" => "1.2.3.4",
-                                                              "type" => "public",
-                                                              "netmask" => "255.255.255.0" }])
-      expect(plugin[:digital_ocean][:networks][:v6]).to eq([{ "ip_address" => "2400:6180:0000:00d0:0000:0000:0009:7001",
-                                                              "type" => "public",
-                                                              "cidr" => 128 }])
+    let(:body) do
+      '{"droplet_id":2756924,"hostname":"sample-droplet","vendor_data":"#cloud-config\ndisable_root: false\nmanage_etc_hosts: true\n\n# The modules that run in the \'init\' stage\ncloud_init_modules:\n - migrator\n - ubuntu-init-switch\n - seed_random\n - bootcmd\n - write-files\n - growpart\n - resizefs\n - set_hostname\n - update_hostname\n - [ update_etc_hosts, once-per-instance ]\n - ca-certs\n - rsyslog\n - users-groups\n - ssh\n\n# The modules that run in the \'config\' stage\ncloud_config_modules:\n - disk_setup\n - mounts\n - ssh-import-id\n - locale\n - set-passwords\n - grub-dpkg\n - apt-pipelining\n - apt-configure\n - package-update-upgrade-install\n - landscape\n - timezone\n - puppet\n - chef\n - salt-minion\n - mcollective\n - disable-ec2-metadata\n - runcmd\n - byobu\n\n# The modules that run in the \'final\' stage\ncloud_final_modules:\n - rightscale_userdata\n - scripts-vendor\n - scripts-per-once\n - scripts-per-boot\n - scripts-per-instance\n - scripts-user\n - ssh-authkey-fingerprints\n - keys-to-console\n - phone-home\n - final-message\n - power-state-change\n","public_keys":["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAkMD3PYKHaH0KbDiXrRE6KCBo/OKcFqhM+fmnnb0+LUh4RalJWX4edeJmnT5bxLeqmLV/Yggjlpfq73R+Dy7JB4pbBLuM959mSM9ohBCSnByAGoT2iUPev4aZFZZ/ahUzTCylNxXrhZV/bopD399CvYREt7Q+FlauBv0O8MMuMGR8aC69Z3jNL+r+fGWNq98JVHGFO/UgoNL15wGCaidMhzfRqkt1u+m1nY77SFM5qWJz2R0CEC4fMlOiCg8mWBklnryV4yDEPgiXp2I8Rli1Eu2GHwuY1YX9elMeQS7n3Pzq7l6aIQmSgvcEWx6TgMD2V7nQUWpfcud/8dpp/t7z9UyfzLmNwnULHNmUeEp52sejcH5lYzISnkkWa1LzlKSeIrhF3y45m9AyxIfjEqyh/mlKQtUaW3NVXXLPwrNitxHtMIZPU5b16BODn0wb8bqPxpDNpUYrQd/BS7mWDxNpICP2ObLPhd9LW9KIYRNTzryE+uKwxm9NkMlhRku2fu415fH0G0+7aURsHviNN9SO4zct3Pj6QE5rnbVHqxt3biplUTOScdWxSk2Nv3V2dGdt/lBfu6iRPAV9IAS31s7Po3qK1t2jpEPCJwstaCBOM80kmoi3zAgotiAW50X8CelaWsHNrq5jBBgeHUZWgn/c8BkcI61pUE9l34Q6gsiEMQ== tsmith84@gmail.com"],"region":"nyc3","interfaces":{"public":[{"ipv4":{"ip_address":"159.203.92.161","netmask":"255.255.240.0","gateway":"159.203.80.1"},"ipv6":{"ip_address":"2604:A880:0800:00A1:0000:0000:0201:0001","cidr":64,"gateway":"2604:A880:0800:00A1:0000:0000:0000:0001"},"anchor_ipv4":{"ip_address":"10.17.0.5","netmask":"255.255.0.0","gateway":"10.17.0.1"},"mac":"04:01:e5:14:03:01","type":"public"}]},"floating_ip":{"ipv4":{"active":false}},"dns":{"nameservers":["2001:4860:4860::8844","2001:4860:4860::8888","8.8.8.8"]}}'
     end
-  end
 
-  shared_examples_for "digital_ocean" do
-    before(:each) do
+    it "should fetch and properly parse json metadata" do
+      expect(@http_client).to receive(:get).
+        with("/metadata/v1.json").
+        and_return(double("Net::HTTP Response", :body => body, :code => "200"))
       plugin.run
-    end
 
-    it "creates a digital_ocean mash" do
       expect(plugin[:digital_ocean]).not_to be_nil
+      expect(plugin[:digital_ocean]["droplet_id"]).to eq(2756924)
+      expect(plugin[:digital_ocean]["hostname"]).to eq("sample-droplet")
     end
 
-    it "has all hint attributes" do
-      expect(plugin[:digital_ocean][:droplet_id]).not_to be_nil
-      expect(plugin[:digital_ocean][:name]).not_to be_nil
-      expect(plugin[:digital_ocean][:image_id]).not_to be_nil
-      expect(plugin[:digital_ocean][:size_id]).not_to be_nil
-      expect(plugin[:digital_ocean][:region_id]).not_to be_nil
-    end
-
-    it "skips the ip_addresses hint attribute" do
-      expect(plugin[:digital_ocean][:ip_addresses]).to be_nil
-    end
+    it "should complete the run despite unavailable metadata" do
+      expect(@http_client).to receive(:get).
+        with("/metadata/v1.json").
+        and_return(double("Net::HTTP Response", :body => "", :code => "404"))
+      plugin.run
 
-    it "has correct values for all hint attributes" do
-      expect(plugin[:digital_ocean][:droplet_id]).to eq(12345678)
-      expect(plugin[:digital_ocean][:name]).to eq("example.com")
-      expect(plugin[:digital_ocean][:image_id]).to eq(3240036)
-      expect(plugin[:digital_ocean][:size_id]).to eq(66)
-      expect(plugin[:digital_ocean][:region_id]).to eq(4)
+      expect(plugin[:digitalocean]).to be_nil
     end
+  end
 
-    include_examples "digital_ocean_networking"
+  describe "without hint or dmi data" do
+    it_should_behave_like "!digital_ocean"
   end
 
   describe "with digital_ocean hint file" do
-    before do
-      allow(plugin).to receive(:hint?).with("digital_ocean").and_return(hint)
-    end
-
-    context "without private networking enabled" do
-      it_behaves_like "digital_ocean"
-    end
+    it_should_behave_like "digital_ocean"
 
-    context "with private networking enabled" do
-      before do
-        plugin[:network][:interfaces][:eth1] = {
-          "addresses" => {
-            "10.128.142.89" => {
-              "netmask" => "255.255.255.0",
-            },
-            "fdf8:f53b:82e4:0000:0000:0000:0000:0053" => {},
-          },
-        }
-
-        plugin.run
-      end
-
-      it "extracts the private networking ips" do
-        expect(plugin[:digital_ocean][:networks][:v4]).to eq([{ "ip_address" => "1.2.3.4",
-                                                                "type" => "public",
-                                                                "netmask" => "255.255.255.0" },
-                                                            { "ip_address" => "10.128.142.89",
-                                                              "type" => "private",
-                                                              "netmask" => "255.255.255.0" }])
-        expect(plugin[:digital_ocean][:networks][:v6]).to eq([{ "ip_address" => "2400:6180:0000:00d0:0000:0000:0009:7001",
-                                                                "type" => "public",
-                                                                "cidr" => 128 },
-                                                           { "ip_address" => "fdf8:f53b:82e4:0000:0000:0000:0000:0053",
-                                                             "type" => "private",
-                                                             "cidr" => 128 }])
-      end
+    before(:each) do
+      allow(plugin).to receive(:hint?).with("digital_ocean").and_return(true)
     end
   end
 
-  describe "without digital_ocean hint file" do
-    before do
-      allow(plugin).to receive(:hint?).with("digital_ocean").and_return(false)
-    end
+  describe "with digital_ocean DMI data" do
+    it_should_behave_like "digital_ocean"
 
-    describe "with the /etc/digitalocean file" do
-      before do
-        allow(File).to receive(:exist?).with(digitalocean_path).and_return(true)
-        plugin.run
-      end
-      it_behaves_like "digital_ocean_networking"
-    end
-
-    describe "without the /etc/digitalocean file" do
-      before do
-        allow(File).to receive(:exist?).with(digitalocean_path).and_return(false)
-      end
-      it_behaves_like "!digital_ocean"
+    before(:each) do
+      plugin[:dmi] = { :bios => { :all_records => [ { :Vendor => "DigitalOcean" } ] } }
     end
   end
 end

data/spec/unit/plugins/dmi_spec.rb

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

data/spec/unit/plugins/ec2_spec.rb

@@ -23,16 +23,14 @@ require "base64"
 
 describe Ohai::System, "plugin ec2" do
 
-  let(:plugin) { get_plugin("ec2") }
-
   before(:each) do
     allow(plugin).to receive(:hint?).with("ec2").and_return(false)
     allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(false)
-    allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(false)
-    allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(false)
   end
 
   shared_examples_for "!ec2" do
+    let(:plugin) { get_plugin("ec2") }
+
     it "DOESN'T attempt to fetch the ec2 metadata or set ec2 attribute" do
       expect(plugin).not_to receive(:http_client)
       expect(plugin[:ec2]).to be_nil
@@ -41,6 +39,8 @@ describe Ohai::System, "plugin ec2" do
   end
 
   shared_examples_for "ec2" do
+    let(:plugin) { get_plugin("ec2") }
+
     before(:each) do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
@@ -334,39 +334,19 @@ describe Ohai::System, "plugin ec2" do
     end
   end # shared examples for ec2
 
-  describe "with amazon dmi bios version data" do
+  describe "with ec2 dmi data" do
     it_behaves_like "ec2"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(true)
-      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_version").and_return("4.2.amazon\n")
+      plugin[:dmi] = { :bios => { :all_records => [ { :Version => "4.2.amazon" } ] } }
     end
   end
 
-  describe "with non-amazon dmi bios version data" do
-    it_behaves_like "!ec2"
-
-    before(:each) do
-      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(true)
-      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_version").and_return("1.0\n")
-    end
-  end
-
-  describe "with amazon dmi bios vendor data" do
+  describe "with amazon kernel data" do
     it_behaves_like "ec2"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(true)
-      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_vendor").and_return("Amazon EC2\n")
-    end
-  end
-
-  describe "with non-amazon dmi bios vendor data" do
-    it_behaves_like "!ec2"
-
-    before(:each) do
-      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(true)
-      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_vendor").and_return("Xen\n")
+      plugin[:kernel] = { :os_info => { :organization => "Amazon.com" } }
     end
   end
 
@@ -375,7 +355,7 @@ describe Ohai::System, "plugin ec2" do
 
     before(:each) do
       allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
-      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("ec2a0561-e4d6-8e15-d9c8-2e0e03adcde8\n")
+      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("ec2a0561-e4d6-8e15-d9c8-2e0e03adcde8")
     end
   end
 
@@ -384,39 +364,7 @@ describe Ohai::System, "plugin ec2" do
 
     before(:each) do
       allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
-      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("123a0561-e4d6-8e15-d9c8-2e0e03adcde8\n")
-    end
-  end
-
-  describe "with EC2 Identifying Number", :windows_only do
-    it_behaves_like "ec2"
-
-    before do
-      allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
-        { "caption" => "Computer System Product",
-          "description" => "Computer System Product",
-          "identifyingnumber" => "ec2a355a-91cd-5fe8-bbfc-cc891d0bf9d6",
-          "name" => "HVM domU",
-          "skunumber" => nil,
-          "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
-          "vendor" => "Xen",
-          "version" => "4.2.amazon" })
-    end
-  end
-
-  describe "without EC2 Identifying Number", :windows_only do
-    it_behaves_like "!ec2"
-
-    before do
-      allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
-        { "caption" => "Computer System Product",
-          "description" => "Computer System Product",
-          "identifyingnumber" => "1234",
-          "name" => "HVM domU",
-          "skunumber" => nil,
-          "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
-          "vendor" => "Xen",
-          "version" => "1.2.3" })
+      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("123a0561-e4d6-8e15-d9c8-2e0e03adcde8")
     end
   end