Merge pull request #949 from chef/dead_code

Remove a bit of dead code

3 files changed, 0 insertions, 11 deletions

diff --git a/lib/ohai/mixin/gce_metadata.rb b/lib/ohai/mixin/gce_metadata.rb
index aef65250..a42a73bc 100644
--- a/lib/ohai/mixin/gce_metadata.rb
+++ b/lib/ohai/mixin/gce_metadata.rb
@@ -94,10 +94,6 @@ module Ohai
         end
       end
 
-      def multiline?(data)
-        data.lines.to_a.size > 1
-      end
-
       def has_trailing_slash?(data)
         !! ( data =~ %r{/$} )
       end
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb
index a0409472..fa54057d 100644
--- a/lib/ohai/plugins/linux/virtualization.rb
+++ b/lib/ohai/plugins/linux/virtualization.rb
@@ -26,10 +26,6 @@ Ohai.plugin(:Virtualization) do
     which("lxc-version")
   end
 
-  def docker_exists?
-    which("docker")
-  end
-
   def nova_exists?
     which("nova")
   end
diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb
index eb0e7860..481c0f6f 100644
--- a/spec/unit/plugins/linux/virtualization_spec.rb
+++ b/spec/unit/plugins/linux/virtualization_spec.rb
@@ -43,7 +43,6 @@ describe Ohai::System, "Linux virtualization platform" do
 
     # default the which wrappers to nil
     allow(plugin).to receive(:lxc_version_exists?).and_return(false)
-    allow(plugin).to receive(:docker_exists?).and_return(false)
     allow(plugin).to receive(:nova_exists?).and_return(false)
   end
 
@@ -708,7 +707,6 @@ CGROUP
     end
 
     it "does not set the old virtualization attributes if they are already set" do
-      allow(plugin).to receive(:docker_exists?).and_return("/usr/bin/docker")
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:system] = "the cloud"
       plugin[:virtualization][:role] = "cumulonimbus"
@@ -718,7 +716,6 @@ CGROUP
     end
 
     it "does not set docker host if docker does not exist" do
-      allow(plugin).to receive(:docker_exists?).and_return(false)
       plugin.run
       expect(plugin[:virtualization][:system]).to be_nil
       expect(plugin[:virtualization][:role]).to be_nil