chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/spec/unit/provider/http_request_spec.rb

@@ -35,7 +35,7 @@ describe Chef::Provider::HttpRequest do
   describe "load_current_resource" do
 
     it "should set up a Chef::REST client, with no authentication" do
-      Chef::REST.should_receive(:new).with(@new_resource.url, nil, nil)
+      Chef::HTTP::Simple.should_receive(:new).with(@new_resource.url)
       @provider.load_current_resource
     end
   end
@@ -45,21 +45,21 @@ describe Chef::Provider::HttpRequest do
       # run_action(x) forces load_current_resource to run;
       # that would overwrite our supplied mock Chef::Rest # object
       @provider.stub!(:load_current_resource).and_return(true)
-      @rest = mock("Chef::REST")
-      @provider.rest = @rest
+      @http = mock("Chef::REST")
+      @provider.http = @http
     end
 
     describe "action_get" do
 
       it "should inflate a message block at runtime" do
         @new_resource.message { "return" }
-        @rest.should_receive(:get).with("http://www.opscode.com/?message=return", false, {})
+        @http.should_receive(:get).with("http://www.opscode.com/?message=return", {})
         @provider.run_action(:get)
         @new_resource.should be_updated
       end
 
       it "should run a GET request" do
-        @rest.should_receive(:get).with("http://www.opscode.com/?message=is cool", false, {})
+        @http.should_receive(:get).with("http://www.opscode.com/?message=is cool", {})
         @provider.run_action(:get)
         @new_resource.should be_updated
       end
@@ -67,14 +67,14 @@ describe Chef::Provider::HttpRequest do
 
     describe "action_put" do
       it "should run a PUT request with the message as the payload" do
-        @rest.should_receive(:put).with("http://www.opscode.com/", @new_resource.message, {})
+        @http.should_receive(:put).with("http://www.opscode.com/", @new_resource.message, {})
         @provider.run_action(:put)
         @new_resource.should be_updated
       end
 
       it "should inflate a message block at runtime" do
         @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:put).with("http://www.opscode.com/", "return", {})
+        @http.should_receive(:put).with("http://www.opscode.com/", "return", {})
         @provider.run_action(:put)
         @new_resource.should be_updated
       end
@@ -82,14 +82,14 @@ describe Chef::Provider::HttpRequest do
 
     describe "action_post" do
       it "should run a PUT request with the message as the payload" do
-        @rest.should_receive(:post).with("http://www.opscode.com/", @new_resource.message, {})
+        @http.should_receive(:post).with("http://www.opscode.com/", @new_resource.message, {})
         @provider.run_action(:post)
         @new_resource.should be_updated
       end
 
       it "should inflate a message block at runtime" do
         @new_resource.message { "return" }
-        @rest.should_receive(:post).with("http://www.opscode.com/", "return", {})
+        @http.should_receive(:post).with("http://www.opscode.com/", "return", {})
         @provider.run_action(:post)
         @new_resource.should be_updated
       end
@@ -97,7 +97,7 @@ describe Chef::Provider::HttpRequest do
 
     describe "action_delete" do
       it "should run a DELETE request" do
-        @rest.should_receive(:delete).with("http://www.opscode.com/", {})
+        @http.should_receive(:delete).with("http://www.opscode.com/", {})
         @provider.run_action(:delete)
         @new_resource.should be_updated
       end
@@ -105,30 +105,30 @@ describe Chef::Provider::HttpRequest do
 
     describe "action_head" do
       before do
-        @provider.rest = @rest
+        @provider.http = @http
       end
 
       it "should inflate a message block at runtime" do
         @new_resource.message { "return" }
-        @rest.should_receive(:head).with("http://www.opscode.com/?message=return", {}).and_return("")
+        @http.should_receive(:head).with("http://www.opscode.com/?message=return", {}).and_return("")
         @provider.run_action(:head)
         @new_resource.should be_updated
       end
 
       it "should run a HEAD request" do
-        @rest.should_receive(:head).with("http://www.opscode.com/?message=is cool", {}).and_return("")
+        @http.should_receive(:head).with("http://www.opscode.com/?message=is cool", {}).and_return("")
         @provider.run_action(:head)
         @new_resource.should be_updated
       end
 
       it "should run a HEAD request with If-Modified-Since header" do
         @new_resource.headers "If-Modified-Since" => File.mtime(__FILE__).httpdate
-        @rest.should_receive(:head).with("http://www.opscode.com/?message=is cool", @new_resource.headers)
+        @http.should_receive(:head).with("http://www.opscode.com/?message=is cool", @new_resource.headers)
         @provider.run_action(:head)
       end
 
       it "doesn't call converge_by if HEAD does not return modified" do
-        @rest.should_receive(:head).and_return(false)
+        @http.should_receive(:head).and_return(false)
         @provider.should_not_receive(:converge_by)
         @provider.run_action(:head)
       end

data/spec/unit/provider/ifconfig/aix_spec.rb

@@ -0,0 +1,180 @@
+#
+# Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef/exceptions'
+
+describe Chef::Provider::Ifconfig::Aix do
+
+  before(:all) do
+    @ifconfig_output = <<-IFCONFIG
+en1: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN>
+        inet 10.153.11.59 netmask 0xffff0000 broadcast 10.153.255.255
+         tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
+en0: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN> metric 1
+        inet 172.29.174.58 netmask 0xffffc000 broadcast 172.29.191.255
+         tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
+lo0: flags=e08084b,c0<UP,BROADCAST,LOOPBACK,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,LARGESEND,CHAIN>
+        inet 127.0.0.1 netmask 0xff000000 broadcast 127.255.255.255
+        inet6 ::1%1/0
+IFCONFIG
+  end
+
+
+  before(:each) do
+    @node = Chef::Node.new
+    @cookbook_collection = Chef::CookbookCollection.new([])
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
+
+    @new_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
+
+    @provider = Chef::Provider::Ifconfig::Aix.new(@new_resource, @run_context)
+  end
+
+  describe "#load_current_resource" do
+    before do
+      status = double("Status", :exitstatus => 0)
+      @provider.should_receive(:popen4).with("ifconfig -a").and_yield(@pid,@stdin,StringIO.new(@ifconfig_output),@stderr).and_return(status)
+      @new_resource.device "en0"
+    end
+    it "should load given interface with attributes." do
+      current_resource = @provider.load_current_resource
+      expect(current_resource.inet_addr).to eq("172.29.174.58")
+      expect(current_resource.target).to eq(@new_resource.target)
+      expect(current_resource.mask).to eq("255.255.192.0")
+      expect(current_resource.bcast).to eq("172.29.191.255")
+      expect(current_resource.metric).to eq("1")
+    end
+  end
+
+  describe "#action_add" do
+
+    it "should add an interface if it does not exist" do
+      @new_resource.device "en10"
+      @provider.stub!(:load_current_resource) do
+        @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
+        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+      end
+      command = "chdev -l #{@new_resource.device} -a netaddr=#{@new_resource.name}"
+      @provider.should_receive(:run_command).with(:command => command)
+
+      @provider.run_action(:add)
+      @new_resource.should be_updated
+    end
+
+    it "should raise exception if metric attribute is set" do
+      @new_resource.device "en0"
+      @new_resource.metric "1"
+      @provider.stub!(:load_current_resource) do
+        @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
+        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+      end
+
+      expect{@provider.run_action(:add)}.to raise_error(Chef::Exceptions::Ifconfig, "interface metric attribute cannot be set for :add action")
+    end
+  end
+
+  describe "#action_enable" do
+    it "should enable an interface if it does not exist" do
+      @new_resource.device "en10"
+      @provider.stub!(:load_current_resource) do
+        @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
+        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+      end
+      command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
+      @provider.should_receive(:run_command).with(:command => command)
+
+      @provider.run_action(:enable)
+      @new_resource.should be_updated
+    end
+  end
+
+  describe "#action_disable" do
+
+    it "should not disable an interface if it does not exist" do
+      @new_resource.device "en10"
+      @provider.stub!(:load_current_resource) do
+        @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
+        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+      end
+
+      @provider.should_not_receive(:run_command)
+
+      @provider.run_action(:disable)
+      @new_resource.should_not be_updated
+    end
+
+    context "interface exists" do
+      before do
+        @new_resource.device "en10"
+        @provider.stub!(:load_current_resource) do
+          @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
+          current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
+          current_resource.device @new_resource.device
+          @provider.instance_variable_set("@current_resource", current_resource)
+        end
+      end
+
+      it "should disable an interface if it exists" do
+        command = "ifconfig #{@new_resource.device} down"
+        @provider.should_receive(:run_command).with(:command => command)
+
+        @provider.run_action(:disable)
+        @new_resource.should be_updated
+      end
+
+    end
+  end
+
+  describe "#action_delete" do
+
+    it "should not delete an interface if it does not exist" do
+      @new_resource.device "en10"
+      @provider.stub!(:load_current_resource) do
+        @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
+        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+      end
+
+      @provider.should_not_receive(:run_command)
+
+      @provider.run_action(:delete)
+      @new_resource.should_not be_updated
+    end
+
+    context "interface exists" do
+      before do
+        @new_resource.device "en10"
+        @provider.stub!(:load_current_resource) do
+          @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
+          current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
+          current_resource.device @new_resource.device
+          @provider.instance_variable_set("@current_resource", current_resource)
+        end
+      end
+
+      it "should delete an interface if it exists" do
+        command = "chdev -l #{@new_resource.device} -a state=down"
+        @provider.should_receive(:run_command).with(:command => command)
+
+        @provider.run_action(:delete)
+        @new_resource.should be_updated
+      end
+    end
+  end
+end

data/spec/unit/provider/ifconfig_spec.rb

@@ -38,20 +38,20 @@ describe Chef::Provider::Ifconfig do
     status = mock("Status", :exitstatus => 0)
     @provider.instance_variable_set("@status", status)
     @provider.current_resource = @current_resource
-    
+
  end
-  describe Chef::Provider::Ifconfig, "load_current_resource" do 
-    before do 
+  describe Chef::Provider::Ifconfig, "load_current_resource" do
+    before do
       status = mock("Status", :exitstatus => 1)
-      @provider.should_receive(:popen4).and_return status 
+      @provider.should_receive(:popen4).and_return status
       @provider.load_current_resource
     end
     it "should track state of ifconfig failure." do
       @provider.instance_variable_get("@status").exitstatus.should_not == 0
     end
-    it "should thrown an exception when ifconfig fails" do 
+    it "should thrown an exception when ifconfig fails" do
       @provider.define_resource_requirements
-      lambda { @provider.process_resource_requirements }.should raise_error Chef::Exceptions::Ifconfig 
+      lambda { @provider.process_resource_requirements }.should raise_error Chef::Exceptions::Ifconfig
     end
   end
   describe Chef::Provider::Ifconfig, "action_add" do
@@ -72,7 +72,7 @@ describe Chef::Provider::Ifconfig do
       @provider.stub!(:load_current_resource)
       @provider.should_not_receive(:run_command)
       @current_resource.inet_addr "10.0.0.1"
-      @provider.should_receive(:generate_config)
+      @provider.should_not_receive(:generate_config)
 
       @provider.run_action(:add)
       @new_resource.should_not be_updated
@@ -84,7 +84,7 @@ describe Chef::Provider::Ifconfig do
   end
 
   describe Chef::Provider::Ifconfig, "action_enable" do
-    
+
     it "should enable interface if does not exist" do
       @provider.stub!(:load_current_resource)
       @current_resource.inet_addr nil
@@ -129,7 +129,7 @@ describe Chef::Provider::Ifconfig do
       @new_resource.should_not be_updated
     end
   end
-  
+
   describe Chef::Provider::Ifconfig, "action_disable" do
 
     it "should disable interface if it exists" do

data/spec/unit/provider/link_spec.rb

@@ -241,8 +241,8 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
           result
         end
         it 'create does no work' do
-          provider.file_class.should_not_receive(:symlink) 
-          provider.file_class.should_not_receive(:link) 
+          provider.file_class.should_not_receive(:symlink)
+          provider.file_class.should_not_receive(:link)
           provider.access_controls.should_not_receive(:set_all)
           provider.run_action(:create)
         end

data/spec/unit/provider/log_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ describe Chef::Provider::Log::ChefLog do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-  end  
+  end
 
   it "should be registered with the default platform hash" do
     Chef::Platform.platforms[:default][:log].should_not be_nil
@@ -37,7 +37,7 @@ describe Chef::Provider::Log::ChefLog do
       Chef::Log.should_receive(:info).with(@log_str).and_return(true)
       @provider.action_write
   end
-  
+
   it "should write the string to the Chef::Log object at debug level" do
       @new_resource = Chef::Resource::Log.new(@log_str)
       @new_resource.level :debug
@@ -53,7 +53,7 @@ describe Chef::Provider::Log::ChefLog do
       Chef::Log.should_receive(:info).with(@log_str).and_return(true)
       @provider.action_write
   end
-  
+
   it "should write the string to the Chef::Log object at warn level" do
       @new_resource = Chef::Resource::Log.new(@log_str)
       @new_resource.level :warn
@@ -61,7 +61,7 @@ describe Chef::Provider::Log::ChefLog do
       Chef::Log.should_receive(:warn).with(@log_str).and_return(true)
       @provider.action_write
   end
-  
+
   it "should write the string to the Chef::Log object at error level" do
       @new_resource = Chef::Resource::Log.new(@log_str)
       @new_resource.level :error
@@ -69,7 +69,7 @@ describe Chef::Provider::Log::ChefLog do
       Chef::Log.should_receive(:error).with(@log_str).and_return(true)
       @provider.action_write
   end
-  
+
   it "should write the string to the Chef::Log object at fatal level" do
       @new_resource = Chef::Resource::Log.new(@log_str)
       @new_resource.level :fatal
@@ -77,5 +77,5 @@ describe Chef::Provider::Log::ChefLog do
       Chef::Log.should_receive(:fatal).with(@log_str).and_return(true)
       @provider.action_write
   end
-  
+
 end

data/spec/unit/provider/mdadm_spec.rb

@@ -25,12 +25,8 @@ describe Chef::Provider::Mdadm do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-
     @new_resource = Chef::Resource::Mdadm.new('/dev/md1')
-    @new_resource.devices ["/dev/sdz1","/dev/sdz2"]
-    @new_resource.level   1
-    @new_resource.chunk   256
-
+    @new_resource.devices ["/dev/sdz1","/dev/sdz2","/dev/sdz3"]
     @provider = Chef::Provider::Mdadm.new(@new_resource, @run_context)
   end
 
@@ -58,9 +54,7 @@ describe Chef::Provider::Mdadm do
   describe "after the metadevice status is known" do
     before(:each) do
       @current_resource = Chef::Resource::Mdadm.new('/dev/md1')
-      @current_resource.devices ["/dev/sdz1","/dev/sdz2"]
-      @current_resource.level   1
-      @current_resource.chunk   256
+      @new_resource.level 5
       @provider.stub!(:load_current_resource).and_return(true)
       @provider.current_resource = @current_resource
     end
@@ -68,7 +62,7 @@ describe Chef::Provider::Mdadm do
     describe "when creating the metadevice" do
       it "should create the raid device if it doesnt exist" do
         @current_resource.exists(false)
-        expected_command = "yes | mdadm --create /dev/md1 --chunk=256 --level 1 --metadata=0.90 --raid-devices 2 /dev/sdz1 /dev/sdz2"
+        expected_command = "yes | mdadm --create /dev/md1 --level 5 --chunk=16 --metadata=0.90 --raid-devices 3 /dev/sdz1 /dev/sdz2 /dev/sdz3"
         @provider.should_receive(:shell_out!).with(expected_command)
         @provider.run_action(:create)
       end
@@ -76,7 +70,16 @@ describe Chef::Provider::Mdadm do
       it "should specify a bitmap only if set" do
         @current_resource.exists(false)
         @new_resource.bitmap('grow')
-        expected_command = "yes | mdadm --create /dev/md1 --chunk=256 --level 1 --metadata=0.90 --bitmap=grow --raid-devices 2 /dev/sdz1 /dev/sdz2"
+        expected_command = "yes | mdadm --create /dev/md1 --level 5 --chunk=16 --metadata=0.90 --bitmap=grow --raid-devices 3 /dev/sdz1 /dev/sdz2 /dev/sdz3"
+        @provider.should_receive(:shell_out!).with(expected_command)
+        @provider.run_action(:create)
+        @new_resource.should be_updated_by_last_action
+      end
+
+      it "should not specify a chunksize if raid level 1" do
+        @current_resource.exists(false)
+        @new_resource.level 1
+        expected_command = "yes | mdadm --create /dev/md1 --level 1 --metadata=0.90 --raid-devices 3 /dev/sdz1 /dev/sdz2 /dev/sdz3"
         @provider.should_receive(:shell_out!).with(expected_command)
         @provider.run_action(:create)
         @new_resource.should be_updated_by_last_action
@@ -93,7 +96,7 @@ describe Chef::Provider::Mdadm do
     describe "when asembling the metadevice" do
       it "should assemble the raid device if it doesnt exist" do
         @current_resource.exists(false)
-        expected_mdadm_cmd = "yes | mdadm --assemble /dev/md1 /dev/sdz1 /dev/sdz2"
+        expected_mdadm_cmd = "yes | mdadm --assemble /dev/md1 /dev/sdz1 /dev/sdz2 /dev/sdz3"
         @provider.should_receive(:shell_out!).with(expected_mdadm_cmd)
         @provider.run_action(:assemble)
         @new_resource.should be_updated_by_last_action