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

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

@@ -73,7 +73,7 @@ describe Chef::Provider::Service::Upstart do
       @stdout = StringIO.new
       @stderr = StringIO.new
       @pid = mock("PID")
-      
+
       ::File.stub!(:exists?).and_return(true)
       ::File.stub!(:open).and_return(true)
     end
@@ -97,7 +97,7 @@ describe Chef::Provider::Service::Upstart do
       before do
       end
 
-      it "should set running to true if the the status command returns 0" do
+      it "should set running to true if the status command returns 0" do
         @stdout = StringIO.new("rsyslog start/running")
         @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
         @provider.load_current_resource
@@ -113,7 +113,7 @@ describe Chef::Provider::Service::Upstart do
     end
 
     describe "when the status command uses the old format" do
-      it "should set running to true if the the status command returns 0" do
+      it "should set running to true if the status command returns 0" do
         @stdout = StringIO.new("rsyslog (start) running, process 32225")
         @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
         @provider.load_current_resource
@@ -172,7 +172,7 @@ describe Chef::Provider::Service::Upstart do
         @provider.load_current_resource
       end
 
-      it "should track state when the user-provided status command fails" do 
+      it "should track state when the user-provided status command fails" do
         @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_raise(Chef::Exceptions::Exec)
         @provider.load_current_resource
         @provider.instance_variable_get("@command_success").should == false
@@ -190,7 +190,7 @@ describe Chef::Provider::Service::Upstart do
       @provider.load_current_resource
       @provider.instance_variable_get("@command_success").should == false
     end
-    
+
     it "should return the current resource" do
       @provider.load_current_resource.should eql(@current_resource)
     end

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

@@ -95,7 +95,7 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
   end
 
   describe Chef::Provider::Service::Windows, "stop_service" do
-    
+
     before(:each) do
       Win32::Service.stub!(:status).with(@new_resource.service_name).and_return(
         mock("StatusStruct", :current_state => "running"),
@@ -143,9 +143,9 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
 
     it "should stop then start the service if it is running" do
       Win32::Service.stub!(:status).with(@new_resource.service_name).and_return(
-        mock("StatusStruct", :current_state => "running"), 
-        mock("StatusStruct", :current_state => "stopped"), 
-        mock("StatusStruct", :current_state => "stopped"), 
+        mock("StatusStruct", :current_state => "running"),
+        mock("StatusStruct", :current_state => "stopped"),
+        mock("StatusStruct", :current_state => "stopped"),
         mock("StatusStruct", :current_state => "running"))
       Win32::Service.should_receive(:stop).with(@new_resource.service_name)
       Win32::Service.should_receive(:start).with(@new_resource.service_name)
@@ -155,8 +155,8 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
 
     it "should just start the service if it is stopped" do
       Win32::Service.stub!(:status).with(@new_resource.service_name).and_return(
-        mock("StatusStruct", :current_state => "stopped"), 
-        mock("StatusStruct", :current_state => "stopped"), 
+        mock("StatusStruct", :current_state => "stopped"),
+        mock("StatusStruct", :current_state => "stopped"),
         mock("StatusStruct", :current_state => "running"))
       Win32::Service.should_receive(:start).with(@new_resource.service_name)
       @provider.restart_service
@@ -201,7 +201,7 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
       @new_resource.updated_by_last_action?.should be_false
     end
   end
-  
+
   describe Chef::Provider::Service::Windows, "disable_service" do
 
     before(:each) do

data/spec/unit/provider/subversion_spec.rb

@@ -247,7 +247,7 @@ describe Chef::Provider::Subversion do
     ::File.stub!(:directory?).with("/my/deploy").and_return(true)
     ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").twice.and_return(false)
     @provider.should_receive(:action_checkout)
-    @provider.run_action(:sync) 
+    @provider.run_action(:sync)
   end
 
   it "runs the sync_command on action_sync if the deploy dir exists and isn't empty" do

data/spec/unit/provider/user/dscl_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.
@@ -29,7 +29,7 @@ describe Chef::Provider::User::Dscl do
     @new_resource = Chef::Resource::User.new("toor")
     @provider = Chef::Provider::User::Dscl.new(@new_resource, @run_context)
   end
-  
+
   describe "when shelling out to dscl" do
     it "should run dscl with the supplied cmd /Path args" do
       shell_return = ShellCmdResult.new('stdout', 'err', 0)
@@ -66,7 +66,7 @@ describe Chef::Provider::User::Dscl do
     before do
       @provider.stub!(:safe_dscl).and_return("\nwheel      200\nstaff      201\n")
     end
-  
+
     it "should run safe_dscl with list /Users uid" do
       @provider.should_receive(:safe_dscl).with("list /Users uid")
       @provider.get_free_uid
@@ -75,7 +75,7 @@ describe Chef::Provider::User::Dscl do
     it "should return the first unused uid number on or above 200" do
       @provider.get_free_uid.should == 202
     end
-  
+
     it "should raise an exception when the search limit is exhausted" do
       search_limit = 1
       lambda { @provider.get_free_uid(search_limit) }.should raise_error(RuntimeError)
@@ -91,7 +91,7 @@ describe Chef::Provider::User::Dscl do
       @provider.should_receive(:safe_dscl).with("list /Users uid")
       @provider.uid_used?(500)
     end
-  
+
     it "should return true for a used uid number" do
       @provider.uid_used?(500).should be_true
     end
@@ -111,7 +111,7 @@ describe Chef::Provider::User::Dscl do
       @provider.should_receive(:get_free_uid).and_return(501)
       lambda { @provider.set_uid }.should raise_error(Chef::Exceptions::RequestedUIDUnavailable)
     end
-  
+
     it "finds a valid, unused uid when none is specified" do
       @provider.should_receive(:safe_dscl).with("list /Users uid").and_return('')
       @provider.should_receive(:safe_dscl).with("create /Users/toor UniqueID 501")
@@ -119,7 +119,7 @@ describe Chef::Provider::User::Dscl do
       @provider.set_uid
       @new_resource.uid.should == 501
     end
-  
+
     it "sets the uid specified in the resource" do
       @new_resource.uid(1000)
       @provider.should_receive(:safe_dscl).with("create /Users/toor UniqueID 1000").and_return(true)
@@ -132,7 +132,7 @@ describe Chef::Provider::User::Dscl do
     before do
       @new_resource.supports({ :manage_home => true })
       @new_resource.home('/Users/toor')
-      
+
       @current_resource = @new_resource.dup
       @provider.current_resource = @current_resource
     end
@@ -142,7 +142,7 @@ describe Chef::Provider::User::Dscl do
       @provider.should_receive(:safe_dscl).with("delete /Users/toor NFSHomeDirectory").and_return(true)
       @provider.modify_home
     end
-  
+
 
     it "raises InvalidHomeDirectory when the resource's home directory doesn't look right" do
       @new_resource.home('epic-fail')
@@ -151,20 +151,20 @@ describe Chef::Provider::User::Dscl do
 
     it "moves the users home to the new location if it exists and the target location is different" do
       @new_resource.supports(:manage_home => true)
-      
+
       current_home = CHEF_SPEC_DATA + '/old_home_dir'
       current_home_files = [current_home + '/my-dot-emacs', current_home + '/my-dot-vim']
       @current_resource.home(current_home)
       @new_resource.gid(23)
       ::File.stub!(:exists?).with('/old/home/toor').and_return(true)
       ::File.stub!(:exists?).with('/Users/toor').and_return(true)
-    
+
       FileUtils.should_receive(:mkdir_p).with('/Users/toor').and_return(true)
       FileUtils.should_receive(:rmdir).with(current_home)
       ::Dir.should_receive(:glob).with("#{CHEF_SPEC_DATA}/old_home_dir/*",::File::FNM_DOTMATCH).and_return(current_home_files)
       FileUtils.should_receive(:mv).with(current_home_files, "/Users/toor", :force => true)
       FileUtils.should_receive(:chown_R).with('toor','23','/Users/toor')
-      
+
       @provider.should_receive(:safe_dscl).with("create /Users/toor NFSHomeDirectory '/Users/toor'")
       @provider.modify_home
     end
@@ -251,7 +251,7 @@ describe Chef::Provider::User::Dscl do
       before do
         @new_resource.password("F"*48)
       end
-    
+
       it "should write a shadow hash file with the expected salted sha1" do
         uuid = "B398449E-CEE0-45E0-80F8-B0B5B1BFDEAA"
         File.should_receive(:open).with('/var/db/shadow/hash/B398449E-CEE0-45E0-80F8-B0B5B1BFDEAA', "w", 384).and_yield(@output)
@@ -262,7 +262,7 @@ describe Chef::Provider::User::Dscl do
         expected_shadow_hash[168] = expected_salted_sha1
         @provider.modify_password
         @output.string.strip.should == expected_shadow_hash
-      end    
+      end
     end
 
     describe "when given a shadow hash file for the password" do
@@ -292,7 +292,7 @@ describe Chef::Provider::User::Dscl do
         @provider.should_receive(:safe_dscl).with("read /Users/toor").and_return("\nAuthenticationAuthority: ;ShadowHash;\n")
         @provider.modify_password
         @output.string.strip.should match(/^0{168}(FFFFFFFF1C1AA7935D4E1190AFEC92343F31F7671FBF126D)0{1071}$/)
-      end    
+      end
     end
 
     it "should write the output directly to the shadow hash file at /var/db/shadow/hash/GUID" do
@@ -392,7 +392,7 @@ describe Chef::Provider::User::Dscl do
     before do
       @current_resource = @new_resource.dup
       @provider.current_resource = @current_resource
-      
+
       # These are all different from @current_resource
       @new_resource.username "mud"
       @new_resource.uid 2342
@@ -400,7 +400,7 @@ describe Chef::Provider::User::Dscl do
       @new_resource.home '/Users/death'
       @new_resource.password 'goaway'
     end
-    
+
     it "sets the user, comment field, uid, gid, moves the home directory, sets the shell, and sets the password" do
       @provider.should_receive :dscl_create_user
       @provider.should_receive :dscl_create_comment
@@ -417,11 +417,11 @@ describe Chef::Provider::User::Dscl do
     before do
       @current_resource = @new_resource.dup
       @provider.current_resource = @current_resource
-      
+
       # This is different from @current_resource
       @new_resource.gid 2342
     end
-    
+
     it "sets the gid" do
       @provider.should_receive :dscl_set_gid
       @provider.manage_user
@@ -436,7 +436,7 @@ describe Chef::Provider::User::Dscl do
       FileUtils.should_receive(:rm_rf).with("/Users/fuuuuuuuuuuuuu")
       @provider.remove_user
     end
-    
+
     it "removes the user from any group memberships" do
       Etc.stub(:group).and_yield(OpenStruct.new(:name => 'ragefisters', :mem => 'toor'))
       @provider.should_receive(:safe_dscl).with("delete /Users/toor")

data/spec/unit/provider/user/pw_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Provider::User::Pw do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    
+
     @new_resource = Chef::Resource::User.new("adam")
     @new_resource.comment   "Adam Jacob"
     @new_resource.uid       1000
@@ -31,7 +31,7 @@ describe Chef::Provider::User::Pw do
     @new_resource.home      "/home/adam"
     @new_resource.shell     "/usr/bin/zsh"
     @new_resource.password  "abracadabra"
-    
+
     @new_resource.supports :manage_home => true
 
     @current_resource = Chef::Resource::User.new("adam")

data/spec/unit/provider/user/windows_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.
@@ -41,7 +41,7 @@ describe Chef::Provider::User::Windows do
     @provider = Chef::Provider::User::Windows.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
   end
-  
+
   describe "when comparing the user's current attributes to the desired attributes" do
     before do
       @new_resource.comment   "Adam Jacob"
@@ -79,7 +79,7 @@ describe Chef::Provider::User::Windows do
       end
 
     end
-    
+
     describe "and the attributes do not match" do
       before do
         @current_resource = Chef::Resource::User.new("adam")
@@ -130,7 +130,7 @@ describe Chef::Provider::User::Windows do
     before(:each) do
       @provider.stub!(:set_options).and_return(:name=> "monkey")
     end
-  
+
     it "should call @net_user.update with the return of set_options" do
       @net_user.should_receive(:update).with(:name=> "monkey")
       @provider.manage_user

data/spec/unit/provider/user_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.
@@ -58,7 +58,7 @@ describe Chef::Provider::User do
   describe "executing load_current_resource" do
     before(:each) do
       @node = Chef::Node.new
-      #@new_resource = mock("Chef::Resource::User", 
+      #@new_resource = mock("Chef::Resource::User",
       #  :null_object => true,
       #  :username => "adam",
       #  :comment => "Adam Jacob",
@@ -152,17 +152,17 @@ describe Chef::Provider::User do
         @new_resource.password "some new password"
         Etc.stub!(:getpwnam).and_return(user)
       end
-      
+
       unless shadow_lib_unavail?
         context "and we have the ruby-shadow gem" do
-          pending "and we are not root (rerun this again as root)", :requires_unprivileged_user => true 
-  
+          pending "and we are not root (rerun this again as root)", :requires_unprivileged_user => true
+
           context "and we are root", :requires_root => true do
             it "should pass assertions when ruby-shadow can be loaded" do
               @provider.action = 'create'
               original_method = @provider.method(:require)
               @provider.should_receive(:require) { |*args| original_method.call(*args) }
-              passwd_info = Struct::PasswdEntry.new(:sp_namp => "adm ", :sp_pwdp => "$1$T0N0Q.lc$nyG6pFI3Dpqa5cxUz/57j0", :sp_lstchg => 14861, :sp_min => 0, :sp_max => 99999, 
+              passwd_info = Struct::PasswdEntry.new(:sp_namp => "adm ", :sp_pwdp => "$1$T0N0Q.lc$nyG6pFI3Dpqa5cxUz/57j0", :sp_lstchg => 14861, :sp_min => 0, :sp_max => 99999,
                                                     :sp_warn => 7, :sp_inact => -1, :sp_expire => -1, :sp_flag => -1)
               Shadow::Passwd.should_receive(:getspnam).with("adam").and_return(passwd_info)
               @provider.load_current_resource
@@ -177,58 +177,50 @@ describe Chef::Provider::User do
         @provider.should_receive(:require).with("shadow") { raise LoadError }
         @provider.load_current_resource
         @provider.define_resource_requirements
-        lambda {@provider.process_resource_requirements}.should raise_error Chef::Exceptions::MissingLibrary 
+        lambda {@provider.process_resource_requirements}.should raise_error Chef::Exceptions::MissingLibrary
       end
 
     end
   end
 
   describe "compare_user" do
-    before(:each) do
-      # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User", 
-      #   :null_object => true,
-      #   :username => "adam",
-      #   :comment => "Adam Jacob",
-      #   :uid => 1000,
-      #   :gid => 1000,
-      #   :home => "/home/adam",
-      #   :shell => "/usr/bin/zsh",
-      #   :password => nil,
-      #   :updated => nil
-      # )
-      # @current_resource = mock("Chef::Resource::User", 
-      #   :null_object => true,
-      #   :username => "adam",
-      #   :comment => "Adam Jacob",
-      #   :uid => 1000,
-      #   :gid => 1000,
-      #   :home => "/home/adam",
-      #   :shell => "/usr/bin/zsh",
-      #   :password => nil,
-      #   :updated => nil
-      # )
-      # @provider = Chef::Provider::User.new(@node, @new_resource)
-      # @provider.current_resource = @current_resource
-    end
+    let(:mapping) {
+      {
+        'username' => ["adam", "Adam"],
+        'comment' => ["Adam Jacob", "adam jacob"],
+        'uid' => [1000, 1001],
+        'gid' => [1000, 1001],
+        'home' => ["/home/adam", "/Users/adam"],
+        'shell'=> ["/usr/bin/zsh", "/bin/bash"],
+        'password'=> ["abcd","12345"]
+      }
+    }
 
     %w{uid gid comment home shell password}.each do |attribute|
       it "should return true if #{attribute} doesn't match" do
-        @new_resource.should_receive(attribute).exactly(2).times.and_return(true)
-        @current_resource.should_receive(attribute).once.and_return(false)
+        @new_resource.send(attribute, mapping[attribute][0])
+        @current_resource.send(attribute, mapping[attribute][1])
         @provider.compare_user.should eql(true)
       end
     end
 
+    %w{uid gid}.each do |attribute|
+      it "should return false if string #{attribute} matches fixnum" do
+        @new_resource.send(attribute, "100")
+        @current_resource.send(attribute, 100)
+        @provider.compare_user.should eql(false)
+      end
+    end
+
     it "should return false if the objects are identical" do
       @provider.compare_user.should eql(false)
-    end  
+    end
   end
 
   describe "action_create" do
     before(:each) do
       @provider.stub!(:load_current_resource)
-      # @current_resource = mock("Chef::Resource::User", 
+      # @current_resource = mock("Chef::Resource::User",
       #   :null_object => true,
       #   :username => "adam",
       #   :comment => "Adam Jacob",
@@ -261,7 +253,7 @@ describe Chef::Provider::User do
       @provider.action_create
     end
 
-    it "should set the the new_resources updated flag when it creates the user if we call manage_user" do
+    it "should set the new_resources updated flag when it creates the user if we call manage_user" do
       @provider.user_exists = true
       @provider.stub!(:compare_user).and_return(true)
       @provider.stub!(:manage_user).and_return(true)
@@ -278,7 +270,7 @@ describe Chef::Provider::User do
 
     it "should not call remove_user if the user does not exist" do
       @provider.user_exists = false
-      @provider.should_not_receive(:remove_user) 
+      @provider.should_not_receive(:remove_user)
       @provider.action_remove
     end
 
@@ -301,10 +293,10 @@ describe Chef::Provider::User do
     before(:each) do
       @provider.stub!(:load_current_resource)
       # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User", 
+      # @new_resource = mock("Chef::Resource::User",
       #   :null_object => true
       # )
-      # @current_resource = mock("Chef::Resource::User", 
+      # @current_resource = mock("Chef::Resource::User",
       #   :null_object => true
       # )
       # @provider = Chef::Provider::User.new(@node, @new_resource)
@@ -344,10 +336,10 @@ describe Chef::Provider::User do
     before(:each) do
       @provider.stub!(:load_current_resource)
       # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User", 
+      # @new_resource = mock("Chef::Resource::User",
       #   :null_object => true
       # )
-      # @current_resource = mock("Chef::Resource::User", 
+      # @current_resource = mock("Chef::Resource::User",
       #   :null_object => true
       # )
       # @provider = Chef::Provider::User.new(@node, @new_resource)
@@ -413,10 +405,10 @@ describe Chef::Provider::User do
     before(:each) do
       @provider.stub!(:load_current_resource)
       # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User", 
+      # @new_resource = mock("Chef::Resource::User",
       #   :null_object => true
       # )
-      # @current_resource = mock("Chef::Resource::User", 
+      # @current_resource = mock("Chef::Resource::User",
       #   :null_object => true
       # )
       # @provider = Chef::Provider::User.new(@node, @new_resource)