chef 10.34.6 → 11.0.0.beta.0

data/spec/unit/provider/remote_directory_spec.rb

@@ -41,7 +41,10 @@ describe Chef::Provider::RemoteDirectory do
     Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, @cookbook_repo) }
 
     @node = Chef::Node.new
-    @cookbook_collection = Chef::CookbookCollection.new(Chef::CookbookLoader.new(@cookbook_repo))
+    cl = Chef::CookbookLoader.new(@cookbook_repo)
+    cl.load_cookbooks
+    @cookbook_collection = Chef::CookbookCollection.new(cl)
+
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
 
@@ -103,8 +106,9 @@ describe Chef::Provider::RemoteDirectory do
 
   describe "when creating the remote directory" do
     before do
-      @node[:platform] = :just_testing
-      @node[:platform_version] = :just_testing
+      @node.automatic_attrs[:platform] = :just_testing
+      @node.automatic_attrs[:platform_version] = :just_testing
+
       @destination_dir = Dir.mktmpdir << "/remote_directory_test"
       @resource.path(@destination_dir)
     end

data/spec/unit/provider/remote_file_spec.rb

@@ -79,6 +79,42 @@ describe Chef::Provider::RemoteFile, "action_create" do
       end
     end
 
+    shared_examples_for "source specified with multiple URIs" do
+      it "should try to download the next URI when the first one fails" do
+        @rest.should_receive(:streaming_request).with("http://foo", {}).once.and_raise(SocketError)
+        @rest.should_receive(:streaming_request).with("http://bar", {}).once.and_return(@tempfile)
+        @provider.run_action(:create)
+      end
+
+      it "should raise an exception when all the URIs fail" do
+        @rest.should_receive(:streaming_request).with("http://foo", {}).once.and_raise(SocketError)
+        @rest.should_receive(:streaming_request).with("http://bar", {}).once.and_raise(SocketError)
+        lambda { @provider.run_action(:create) }.should raise_error(SocketError)
+      end
+
+      it "should download from only one URI when the first one works" do
+        @rest.should_receive(:streaming_request).once.and_return(@tempfile)
+        @provider.run_action(:create)
+      end
+
+    end
+
+    describe "and the source specifies multiple URIs using multiple arguments" do
+      it_should_behave_like "source specified with multiple URIs"
+
+      before(:each) do
+        @resource.source("http://foo", "http://bar")
+      end
+    end
+
+    describe "and the source specifies multiple URIs using an array" do
+      it_should_behave_like "source specified with multiple URIs"
+
+      before(:each) do
+        @resource.source([ "http://foo", "http://bar" ])
+      end
+    end
+
     describe "and the resource specifies a checksum" do
 
       describe "and the existing file matches the checksum exactly" do

data/spec/unit/provider/route_spec.rb

@@ -51,7 +51,7 @@ describe Chef::Provider::Route do
   describe Chef::Provider::Route, "load_current_resource" do
     context "on linux" do
       before do
-        @node[:os] = 'linux'
+        @node.automatic_attrs[:os] = 'linux'
         routing_table = "Iface	Destination	Gateway 	Flags	RefCnt	Use	Metric	Mask		MTU	Window	IRTT\n" +
                         "eth0	0064A8C0	0984A8C0	0003	0	0	0	00FFFFFF	0	0	0\n"
         route_file = StringIO.new(routing_table)
@@ -198,7 +198,7 @@ describe Chef::Provider::Route do
   describe Chef::Provider::Route, "generate_config method" do
     %w[ centos redhat fedora ].each do |platform|
       it "should write a route file on #{platform} platform" do
-        @node[:platform] = platform
+        @node.automatic_attrs[:platform] = platform
 
         route_file = StringIO.new
         File.should_receive(:new).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
@@ -209,7 +209,8 @@ describe Chef::Provider::Route do
     end
 
     it "should put all routes for a device in a route config file" do
-      @node[:platform] = 'centos'
+      @node.automatic_attrs[:platform] = 'centos'
+
       route_file = StringIO.new
       File.should_receive(:new).and_return(route_file)
       @run_context.resource_collection << Chef::Resource::Route.new('192.168.1.0/24 via 192.168.0.1')

data/spec/unit/provider/ruby_block_spec.rb

@@ -30,6 +30,14 @@ describe Chef::Provider::RubyBlock, "initialize" do
   end
 
   it "should call the block and flag the resource as updated" do
+    @provider.run_action(:run)
+    $evil_global_evil_laugh.should == :mwahahaha
+    @new_resource.should be_updated
+  end
+
+  it "accepts `create' as an alias for `run'" do
+    # SEE ALSO: CHEF-3500
+    # "create" used to be the default action, it was renamed.
     @provider.run_action(:create)
     $evil_global_evil_laugh.should == :mwahahaha
     @new_resource.should be_updated

data/spec/unit/provider/service/arch_service_spec.rb

@@ -27,7 +27,7 @@ require 'ostruct'
 describe Chef::Provider::Service::Arch, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
 
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
@@ -62,7 +62,7 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
       @provider.load_current_resource
     end
   
-    it "should set running to true if the status command returns 0" do
+    it "should set running to true if the the status command returns 0" do
       @provider.stub!(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
       @provider.load_current_resource
       @provider.current_resource.running.should be_true
@@ -96,14 +96,14 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
   end
 
   it "should raise error if the node has a nil ps attribute and no other means to get status" do
-    @node[:command] = {:ps => nil}
+    @node.automatic_attrs[:command] = {:ps => nil}
     @provider.define_resource_requirements
     @provider.action = :start
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
   end
 
   it "should raise error if the node has an empty ps attribute and no other means to get status" do
-    @node[:command] = {:ps => ""}
+    @node.automatic_attrs[:command] = {:ps => ""}
     @provider.define_resource_requirements
     @provider.action = :start
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
@@ -130,7 +130,7 @@ DEFAULT_PS
       @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
       @provider.stub!(:shell_out!).and_return(@status)
       
-      @node[:command] = {:ps => "ps -ef"}
+      @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     end
 
     it "determines the service is running when it appears in ps" do

data/spec/unit/provider/service/debian_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Debian, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => 'fuuuu'}
+    @node.automatic_attrs[:command] = {:ps => 'fuuuu'}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 

data/spec/unit/provider/service/freebsd_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Freebsd do
   before do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ax"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ax"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -88,7 +88,7 @@ RC_SAMPLE
         @provider.load_current_resource
       end
 
-      it "should set running to true if the status command returns 0" do
+      it "should set running to true if the the status command returns 0" do
         @provider.should_receive(:shell_out).with("/usr/local/etc/rc.d/#{@current_resource.service_name} status").and_return(@status)
         @current_resource.should_receive(:running).with(true)
         @provider.load_current_resource
@@ -115,13 +115,13 @@ RC_SAMPLE
     end
 
     it "should raise error if the node has a nil ps attribute and no other means to get status" do
-      @node[:command] = {:ps => nil}
+      @node.automatic_attrs[:command] = {:ps => nil}
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
     end
 
     it "should raise error if the node has an empty ps attribute and no other means to get status" do
-      @node[:command] = {:ps => ""}
+      @node.automatic_attrs[:command] = {:ps => ""}
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
     end
@@ -180,7 +180,7 @@ RC_SAMPLE
 
     describe "when we have a 'ps' attribute" do
       before do
-        @node[:command] = {:ps => "ps -ax"}
+        @node.automatic_attrs[:command] = {:ps => "ps -ax"}
       end
 
       it "should shell_out! the node's ps command" do

data/spec/unit/provider/service/init_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Init, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -61,7 +61,7 @@ PS
       @provider.load_current_resource
     end
   
-    it "should set running to true if the status command returns 0" do
+    it "should set running to true if the the status command returns 0" do
       @provider.stub!(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
       @provider.load_current_resource
       @current_resource.running.should be_true
@@ -93,10 +93,23 @@ PS
     
   end
   
+  describe "when an init command has been specified" do
+    before do
+      @new_resource.stub!(:init_command).and_return("/opt/chef-server/service/erchef")
+      @provider = Chef::Provider::Service::Init.new(@new_resource, @run_context)
+    end
+
+    it "should use the init_command if one has been specified" do
+      @provider.should_receive(:shell_out!).with("/opt/chef-server/service/erchef start")
+      @provider.start_service
+    end
+
+  end
+
   describe "when the node has not specified a ps command" do
     
     it "should raise an error if the node has a nil ps attribute" do
-      @node[:command] = {:ps => nil}
+      @node.automatic_attrs[:command] = {:ps => nil}
       @provider.load_current_resource
       @provider.action = :start
       @provider.define_resource_requirements
@@ -104,7 +117,7 @@ PS
     end
 
     it "should raise an error if the node has an empty ps attribute" do
-      @node[:command] = {:ps => ""}
+      @node.automatic_attrs[:command] = {:ps => ""}
       @provider.load_current_resource
       @provider.action = :start
       @provider.define_resource_requirements
@@ -209,4 +222,14 @@ RUNNING_PS
       @provider.reload_service()
     end
   end
+
+  describe "when a custom command has been specified" do
+    before do
+      @new_resource.start_command("/etc/init.d/chef startyousillysally")
+    end
+
+    it "should still pass all why run assertions" do
+      lambda { @provider.run_action(:start) }.should_not raise_error(Chef::Exceptions::Service)
+    end
+  end
 end

data/spec/unit/provider/service/insserv_service_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Provider::Service::Insserv do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @node[:command] = {:ps => "ps -ax"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ax"}
 
     @new_resource = Chef::Resource::Service.new("initgrediant")
     @current_resource = Chef::Resource::Service.new("initgrediant")

data/spec/unit/provider/service/invokercd_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Invokercd, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -61,7 +61,7 @@ PS
       @provider.load_current_resource
     end
   
-    it "should set running to true if the status command returns 0" do
+    it "should set running to true if the the status command returns 0" do
       @provider.stub!(:shell_out).with("/usr/sbin/invoke-rc.d #{@current_resource.service_name} status").and_return(@status)
       @provider.load_current_resource
       @current_resource.running.should be_true
@@ -95,14 +95,14 @@ PS
   
   describe "when the node has not specified a ps command" do
     it "should raise error if the node has a nil ps attribute and no other means to get status" do
-      @node[:command] = {:ps => nil}
+      @node.automatic_attrs[:command] = {:ps => nil}
       @provider.action = :start
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
     end
 
     it "should raise error if the node has an empty ps attribute and no other means to get status" do
-      @node[:command] = {:ps => ""}
+      @node.automatic_attrs[:command] = {:ps => ""}
       @provider.action = :start
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)

data/spec/unit/provider/service/macosx_spec.rb

@@ -23,31 +23,13 @@ describe Chef::Provider::Service::Macosx do
   let(:events) {Chef::EventDispatch::Dispatcher.new}
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:provider) { described_class.new(new_resource, run_context) }
-  let(:launchctl_stdout) { StringIO.new }
-  let(:plutil_stdout) { String.new <<-XML }
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>io.redis.redis-server</string>
-</dict>
-</plist>
-XML
+  let(:stdout) { StringIO.new }
 
   before do
     Dir.stub!(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
     provider.stub!(:shell_out!).
              with("launchctl list", {:group => 1001, :user => 101}).
-             and_return(mock("Status", :stdout => launchctl_stdout))
-    provider.stub!(:shell_out).
-             with(/launchctl list /,
-                  {:group => nil, :user => nil}).
-             and_return(mock("Status",
-                        :stdout => launchctl_stdout, :exitstatus => 0))
-    provider.stub!(:shell_out!).
-             with(/plutil -convert xml1 -o/).
-             and_return(mock("Status", :stdout => plutil_stdout))
+             and_return(mock("ouput", :stdout => stdout))
 
     File.stub!(:stat).and_return(mock("stat", :gid => 1001, :uid => 101))
   end
@@ -58,45 +40,8 @@ XML
       let!(:current_resource) { Chef::Resource::Service.new(service_name) }
 
       describe "#load_current_resource" do
-
-        # CHEF-5223 "you can't glob for a file that hasn't been converged
-        # onto the node yet."
-        context "when the plist doesn't exist" do
-
-          def run_resource_setup_for_action(action)
-            new_resource.action(action)
-            provider.action = action
-            provider.load_current_resource
-            provider.define_resource_requirements
-            provider.process_resource_requirements
-          end
-
-          before do
-            Dir.stub(:glob).and_return([])
-            provider.stub(:shell_out!).
-                     with(/plutil -convert xml1 -o/).
-                     and_raise(Mixlib::ShellOut::ShellCommandFailed)
-          end
-
-          it "works for action :nothing" do
-            lambda { run_resource_setup_for_action(:nothing) }.should_not raise_error
-          end
-
-          it "works for action :start" do
-            lambda { run_resource_setup_for_action(:start) }.should_not raise_error
-          end
-
-          it "errors if action is :enable" do
-            lambda { run_resource_setup_for_action(:enable) }.should raise_error(Chef::Exceptions::Service)
-          end
-
-          it "errors if action is :disable" do
-            lambda { run_resource_setup_for_action(:disable) }.should raise_error(Chef::Exceptions::Service)
-          end
-        end
-
         context "when launchctl returns pid in service list" do
-          let(:launchctl_stdout) { StringIO.new <<-SVC_LIST }
+          let(:stdout) { StringIO.new <<-SVC_LIST }
 12761 - 0x100114220.old.machinit.thing
 7777  - io.redis.redis-server
 - - com.lol.stopped-thing
@@ -116,21 +61,21 @@ SVC_LIST
         end
 
         describe "running unsupported actions" do
-          let(:launchctl_stdout) { StringIO.new <<-SVC_LIST }
-12761 - 0x100114220.old.machinit.thing
-7777  - io.redis.redis-server
-- - com.lol.stopped-thing
-SVC_LIST
-
           before do
             Dir.stub!(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
           end
+          it "should throw an exception when enable action is attempted" do
+            lambda {provider.run_action(:enable)}.should raise_error(Chef::Exceptions::UnsupportedAction)
+          end
           it "should throw an exception when reload action is attempted" do
             lambda {provider.run_action(:reload)}.should raise_error(Chef::Exceptions::UnsupportedAction)
           end
+          it "should throw an exception when disable action is attempted" do
+            lambda {provider.run_action(:disable)}.should raise_error(Chef::Exceptions::UnsupportedAction)
+          end
         end
         context "when launchctl returns empty service pid" do
-          let(:launchctl_stdout) { StringIO.new <<-SVC_LIST }
+          let(:stdout) { StringIO.new <<-SVC_LIST }
 12761 - 0x100114220.old.machinit.thing
 - - io.redis.redis-server
 - - com.lol.stopped-thing
@@ -150,7 +95,7 @@ SVC_LIST
         end
 
         context "when launchctl doesn't return service entry at all" do
-          let(:launchctl_stdout) { StringIO.new <<-SVC_LIST }
+          let(:stdout) { StringIO.new <<-SVC_LIST }
 12761 - 0x100114220.old.machinit.thing
 - - com.lol.stopped-thing
 SVC_LIST

data/spec/unit/provider/service/redhat_spec.rb

@@ -44,7 +44,7 @@ describe "Chef::Provider::Service::Redhat" do
 
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => 'foo'}
+    @node.automatic_attrs[:command] = {:ps => 'foo'}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
  

data/spec/unit/provider/service/simple_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Simple, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -51,13 +51,13 @@ NOMOCKINGSTRINGSPLZ
   end
 
   it "should raise error if the node has a nil ps attribute and no other means to get status" do
-    @node[:command] = {:ps => nil}
+    @node.automatic_attrs[:command] = {:ps => nil}
     @provider.define_resource_requirements
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
   end
 
   it "should raise error if the node has an empty ps attribute and no other means to get status" do
-    @node[:command] = {:ps => ""}
+    @node.automatic_attrs[:command] = {:ps => ""}
     @provider.define_resource_requirements
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
   end