ohai 6.24.2 → 7.0.0.rc.0

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -22,52 +22,51 @@ require 'open-uri'
 
 describe Ohai::System, "plugin eucalyptus" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
+    @plugin = get_plugin("eucalyptus")
   end
 
   shared_examples_for "!eucalyptus" do
     it "should NOT attempt to fetch the eucalyptus metadata" do
       OpenURI.should_not_receive(:open)
-      @ohai._require_plugin("eucalyptus")
+      @plugin.run
     end
   end
 
   shared_examples_for "eucalyptus" do
     before(:each) do
-      @http_client = mock("Net::HTTP client")
-      @ohai.stub!(:http_client).and_return(@http_client)
+      @http_client = double("Net::HTTP client")
+      @plugin.stub(:http_client).and_return(@http_client)
 
       @http_client.should_receive(:get).
         with("/").twice.
-        and_return(mock("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
+        and_return(double("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
       @http_client.should_receive(:get).
         with("/2012-01-12/meta-data/").
-        and_return(mock("Net::HTTP Response", :body => "instance_type\nami_id\nsecurity-groups", :code => "200"))
+        and_return(double("Net::HTTP Response", :body => "instance_type\nami_id\nsecurity-groups", :code => "200"))
       @http_client.should_receive(:get).
         with("/2012-01-12/meta-data/instance_type").
-        and_return(mock("Net::HTTP Response", :body => "c1.medium", :code => "200"))
+        and_return(double("Net::HTTP Response", :body => "c1.medium", :code => "200"))
       @http_client.should_receive(:get).
         with("/2012-01-12/meta-data/ami_id").
-        and_return(mock("Net::HTTP Response", :body => "ami-5d2dc934", :code => "200"))
+        and_return(double("Net::HTTP Response", :body => "ami-5d2dc934", :code => "200"))
       @http_client.should_receive(:get).
         with("/2012-01-12/meta-data/security-groups").
-        and_return(mock("Net::HTTP Response", :body => "group1\ngroup2", :code => "200"))
+        and_return(double("Net::HTTP Response", :body => "group1\ngroup2", :code => "200"))
       @http_client.should_receive(:get).
         with("/2012-01-12/user-data/").
-        and_return(mock("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
+        and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
     end
 
     it "should recursively fetch all the eucalyptus metadata" do
-      IO.stub!(:select).and_return([[],[1],[]])
-      t = mock("connection")
-      t.stub!(:connect_nonblock).and_raise(Errno::EINPROGRESS)
-      Socket.stub!(:new).and_return(t)
-      @ohai._require_plugin("eucalyptus")
-      @ohai[:eucalyptus].should_not be_nil
-      @ohai[:eucalyptus]['instance_type'].should == "c1.medium"
-      @ohai[:eucalyptus]['ami_id'].should == "ami-5d2dc934"
-      @ohai[:eucalyptus]['security_groups'].should eql ['group1', 'group2']
+      IO.stub(:select).and_return([[],[1],[]])
+      t = double("connection")
+      t.stub(:connect_nonblock).and_raise(Errno::EINPROGRESS)
+      Socket.stub(:new).and_return(t)
+      @plugin.run
+      @plugin[:eucalyptus].should_not be_nil
+      @plugin[:eucalyptus]['instance_type'].should == "c1.medium"
+      @plugin[:eucalyptus]['ami_id'].should == "ami-5d2dc934"
+      @plugin[:eucalyptus]['security_groups'].should eql ['group1', 'group2']
     end
   end
 
@@ -75,8 +74,8 @@ describe Ohai::System, "plugin eucalyptus" do
     it_should_behave_like "eucalyptus"
 
     before(:each) do
-      IO.stub!(:select).and_return([[],[1],[]])
-      @ohai[:network] = { "interfaces" => { "eth0" => { "addresses" => { "d0:0d:95:47:6E:ED"=> { "family" => "lladdr" } } } } }
+      IO.stub(:select).and_return([[],[1],[]])
+      @plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "d0:0d:95:47:6E:ED"=> { "family" => "lladdr" } } } } }
     end
   end
 
@@ -84,7 +83,7 @@ describe Ohai::System, "plugin eucalyptus" do
     it_should_behave_like "!eucalyptus"
 
     before(:each) do
-      @ohai[:network] = { "interfaces" => { "eth0" => { "addresses" => { "ff:ff:95:47:6E:ED"=> { "family" => "lladdr" } } } } }
+      @plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "ff:ff:95:47:6E:ED"=> { "family" => "lladdr" } } } } }
     end
   end
 
@@ -92,10 +91,10 @@ describe Ohai::System, "plugin eucalyptus" do
     it_should_behave_like "eucalyptus"
 
     before(:each) do
-      File.stub!(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(true)
-      File.stub!(:read).with('/etc/chef/ohai/hints/eucalyptus.json').and_return('')
-      File.stub!(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(true)
-      File.stub!(:read).with('C:\chef\ohai\hints/eucalyptus.json').and_return('')
+      File.stub(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(true)
+      File.stub(:read).with('/etc/chef/ohai/hints/eucalyptus.json').and_return('')
+      File.stub(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(true)
+      File.stub(:read).with('C:\chef\ohai\hints/eucalyptus.json').and_return('')
     end
   end
 
@@ -103,8 +102,9 @@ describe Ohai::System, "plugin eucalyptus" do
     it_should_behave_like "!eucalyptus"
 
     before(:each) do
-      File.stub!(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(false)
-      File.stub!(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
+      @plugin[:network] = {:interfaces => {}}
+      File.stub(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(false)
+      File.stub(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
     end
   end
 
@@ -112,10 +112,14 @@ describe Ohai::System, "plugin eucalyptus" do
     it_should_behave_like "!eucalyptus"
 
     before(:each) do
-      File.stub!(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
-      File.stub!(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
-      File.stub!(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-      File.stub!(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
+      @plugin[:network] = {:interfaces => {}}
+
+      File.stub(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(false)
+      File.stub(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
+      File.stub(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
+      File.stub(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
+      File.stub(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
+      File.stub(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
     end
   end
 

data/spec/unit/plugins/fail_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Toomas Pelberg (toomas.pelberg@playtech.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Claire McQuin (claire@opscode.com)
+# Copyright:: Copyright (c) 2011, 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,43 +21,295 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_he
 
 tmp = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
 
-describe Ohai::System, "plugin fail" do
-  
+shared_examples "a v7 loading failure" do
   before(:all) do
     begin
       Dir.mkdir("#{tmp}/plugins")
     rescue Errno::EEXIST
-      # Ignore it
+      # ignore
     end
-    fail_plugin=File.open("#{tmp}/plugins/fail.rb","w+")
-    fail_plugin.write("provides \"fail\"require 'thiswillblowupinyourface'\nk=MissingClassName.new\nfail \"ohnoes\"")
-    fail_plugin.close
-    real_plugin=File.open("#{tmp}/plugins/real.rb","w+")
-    real_plugin.write("provides \"real\"\nreal \"useful\"\n")
-    real_plugin.close
-    @plugin_path=Ohai::Config[:plugin_path]
   end
-  
+
   before(:each) do
-    Ohai::Config[:plugin_path]=["#{tmp}/plugins"]
-    @ohai=Ohai::System.new
+    fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
+    fail_file.write(failstr)
+    fail_file.close
   end
-  
+
+  after(:each) do
+    File.delete("#{tmp}/plugins/fail.rb")
+  end
+
   after(:all) do
+    begin
+      Dir.delete("#{tmp}/plugins")
+    rescue
+      # ignore
+    end
+  end
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @loader = Ohai::Loader.new(@ohai)
+  end
+
+  it "should not have attribute keys" do
+    @loader.load_plugin("#{tmp}/plugins/fail.rb")
+    #@ohai.attributes.should_not have_key("fail")
+    lambda { @ohai.provides_map.find_providers_for(["fail"]) }.should raise_error(Ohai::Exceptions::AttributeNotFound)
+  end
+
+  it "should not have source key" do
+    @loader.load_plugin("#{tmp}/plugins/fail.rb")
+    @ohai.v6_dependency_solver.should_not have_key("#{tmp}/plugins/fail.rb")
+  end
+
+  it "should write to Ohai::Log" do
+    Ohai::Log.should_receive(:warn).once
+    @loader.load_plugin("#{tmp}/plugins/fail.rb")
+  end
+end
+
+shared_examples "a v7 loading success" do
+  before(:all) do
+    begin
+      Dir.mkdir("#{tmp}/plugins")
+    rescue Errno::EEXIST
+      # ignore
+    end
+  end
+
+  before(:each) do
+    fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
+    fail_file.write(failstr)
+    fail_file.close
+  end
+
+  after(:each) do
     File.delete("#{tmp}/plugins/fail.rb")
-    File.delete("#{tmp}/plugins/real.rb")
+  end
+
+  after(:all) do
     begin
       Dir.delete("#{tmp}/plugins")
     rescue
-      # Don't care if it fails
+      # ignore
     end
-    Ohai::Config[:plugin_path]=@plugin_path
   end
-  
-  it "should continue gracefully if plugin loading fails" do
-    @ohai.require_plugin("fail")
-    @ohai.require_plugin("real")
-    @ohai.data[:real].should eql("useful")
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @loader = Ohai::Loader.new(@ohai)
+  end
+
+  it "should have attribute keys" do
+    @loader.load_plugin("#{tmp}/plugins/fail.rb")
+    @ohai.provides_map.should have_key("fail")
+  end
+
+  it "should have source key" do
+    @loader.load_plugin("#{tmp}/plugins/fail.rb")
+    @ohai.v6_dependency_solver.should have_key("#{tmp}/plugins/fail.rb")
+  end
+
+  it "should not write to Ohai::Log" do
+    Ohai::Log.should_not_receive(:warn)
+    @loader.load_plugin("#{tmp}/plugins/fail.rb")
+  end
+end
+
+shared_examples "a v7 run failure" do
+  before(:all) do
+    begin
+      Dir.mkdir("#{tmp}/plugins")
+    rescue Errno::EEXIST
+      # ignore
+    end
+  end
+
+  before(:each) do
+    fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
+    fail_file.write(failstr)
+    fail_file.close
+  end
+
+  after(:each) do
+    File.delete("#{tmp}/plugins/fail.rb")
+  end
+
+  after(:all) do
+    begin
+      Dir.delete("#{tmp}/plugins")
+    rescue
+      # ignore
+    end
+  end
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @loader = Ohai::Loader.new(@ohai)
+  end
+
+  it "should not have new attribute keys" do
+    @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
+    @ohai.provides_map.should_not have_key("other")
+  end
+
+  it "should write to Ohai::Log" do
+    Ohai::Log.should_receive(:warn).once
+    @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
+  end
+end
+
+=begin
+shared_examples "a v6 run failure" do
+  before(:all) do
+    begin
+      Dir.mkdir("#{tmp}/plugins")
+    rescue Errno::EEXIST
+      # ignore
+    end
+  end
+
+  before(:each) do
+    fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
+    fail_file.write(failstr)
+    fail_file.close
+  end
+
+  after(:each) do
+    File.delete("#{tmp}/plugins/fail.rb")
+  end
+
+  after(:all) do
+    begin
+      Dir.delete("#{tmp}/plugins")
+    rescue
+      # ignore
+    end
+  end
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @loader = Ohai::Loader.new(@ohai)
+  end
+
+  it "should not add data keys" do
+    @loader.load_plugin("#{tmp}/plugins/fail.rb")
     @ohai.data.should_not have_key("fail")
   end
+
+  it "should write to Ohai::Log" do
+    Ohai::Log.should_receive(:warn).once
+    @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
+  end
+end
+=end
+
+describe "when using DSL commands outside Ohai.plugin block" do
+  failstr1 = <<EOF
+provides "fail"
+Ohai.plugin do
+end
+EOF
+
+  failstr2 = <<EOF
+depends "fail"
+Ohai.plugin do
+end
+EOF
+
+  failstr3 = <<EOF
+collect_data do
+end
+Ohai.plugin do
+end
+EOF
+
+  it_behaves_like "a v7 loading failure" do
+    let(:failstr) { failstr1 }
+  end
+
+  it_behaves_like "a v7 loading failure" do
+    let(:failstr) { failstr2 }
+  end
+
+  it_behaves_like "a v7 loading failure" do
+    let(:failstr) { failstr3 }
+  end
+end
+
+describe "when using nonexistent DSL commands in Ohai.plugin block" do
+  failstr = "Ohai.plugin do\n\tcreates \"fail\"\nend\n"
+  
+  it_behaves_like "a v7 loading failure" do
+    let(:failstr) { failstr }
+  end
+end
+
+=begin
+describe "when using DSL commands in collect_data block" do
+  failstr1 = <<EOF
+Ohai.plugin do
+  provides "fail"
+  collect_data do
+    provides "other"
+  end
+end
+EOF
+
+  failstr2 =<<EOF
+Ohai.plugin do
+  provides "fail"
+  collect_data do
+    provides "other"
+  end
+end
+EOF
+  
+  it_behaves_like "a v7 loading success" do
+    let(:failstr) { failstr1 }
+  end
+
+  it_behaves_like "a v7 run failure" do
+    let(:failstr) { failstr1 }
+  end
+
+  it_behaves_like "a v7 loading success" do
+    let(:failstr) { failstr2 }
+  end
+
+  it_behaves_like "a v7 run failure" do
+    let(:failstr) { failstr2 }
+  end
+end
+
+describe "when setting undeclared attribute in collect_data block" do
+  failstr = <<EOF
+Ohai.plugin do
+  provides "fail"
+  collect_data do
+    creates "other"
+  end
+end
+EOF
+  it_behaves_like "a v7 loading success" do
+    let(:failstr) { failstr }
+  end
+
+  it_behaves_like "a v7 run failure" do
+    let(:failstr) { failstr }
+  end
+end
+
+describe "when setting undeclared attribute" do
+  failstr = <<EOF
+provides "fail"
+other "attribute"
+EOF
+
+  it_behaves_like "a v6 run failure" do
+    let(:failstr) { failstr }
+  end
 end
+=end