diff options
author | Tim Smith <tsmith84@gmail.com> | 2016-03-31 11:44:15 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2016-03-31 11:44:15 -0700 |
commit | 3dcb08cee47263b7a025203ad9b20e7d778a8d5c (patch) | |
tree | 578b1178673d8d7efaada9b7e53596800bee3fd4 /spec/unit | |
parent | 5904607f0dde61751dab4d8c8d03811e369b3f17 (diff) | |
download | ohai-3dcb08cee47263b7a025203ad9b20e7d778a8d5c.tar.gz |
Remove the Xen MAC address detection method
This false detects any Xen system and is less than ideal
Diffstat (limited to 'spec/unit')
-rw-r--r-- | spec/unit/plugins/ec2_spec.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/spec/unit/plugins/ec2_spec.rb b/spec/unit/plugins/ec2_spec.rb index b5d4e87b..ef67bfba 100644 --- a/spec/unit/plugins/ec2_spec.rb +++ b/spec/unit/plugins/ec2_spec.rb @@ -24,7 +24,6 @@ require "base64" describe Ohai::System, "plugin ec2" do before(:each) do @plugin = get_plugin("ec2") - @plugin[:network] = { :interfaces => { :eth0 => {} } } allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false) allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false) end @@ -254,20 +253,6 @@ describe Ohai::System, "plugin ec2" do end end # shared examples for ec2 - describe "without dmi data, kernel organization, with xen mac, and metadata address connected" do - before(:each) do - allow(IO).to receive(:select).and_return([[], [1], []]) - @plugin[:network][:interfaces][:eth0][:arp] = { "169.254.1.0" => "fe:ff:ff:ff:ff:ff" } - end - - it_should_behave_like "ec2" - - it "warns that the arp table method is deprecated" do - expect(Ohai::Log).to receive(:warn).with(/will be removed/) - @plugin.has_xen_mac? - end - end - describe "with ec2 dmi data" do it_should_behave_like "ec2" @@ -316,7 +301,6 @@ describe Ohai::System, "plugin ec2" do allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false) allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false) @plugin[:dmi] = nil - @plugin[:network][:interfaces][:eth0][:arp] = { "169.254.1.0" => "00:50:56:c0:00:08" } end end |