microwave 1.0.4 → 11.400.2

data/spec/unit/provider/ifconfig_spec.rb

@@ -183,7 +183,7 @@ describe Chef::Provider::Ifconfig do
      
      it "should write network-script for centos" do
       @provider.stub!(:load_current_resource)
-      @node[:platform] = "centos"
+      @node.automatic_attrs[:platform] = "centos"
       @provider.stub!(:run_command)
       config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
       config_file = StringIO.new
@@ -199,7 +199,7 @@ describe Chef::Provider::Ifconfig do
   describe Chef::Provider::Ifconfig, "delete_config for action_delete" do
 
     it "should delete network-script if it exists for centos" do
-      @node[:platform] = "centos"
+      @node.automatic_attrs[:platform] = "centos"
       @current_resource.device "eth0"
       @provider.stub!(:load_current_resource)
       @provider.stub!(:run_command)

data/spec/unit/provider/link_spec.rb

@@ -25,7 +25,7 @@ if Chef::Platform.windows?
   require 'chef/win32/file' #probably need this in spec_helper
 end
 
-describe Chef::Resource::Link do
+describe Chef::Resource::Link, :not_supported_on_win2k3 do
   let(:provider) do
     node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new

data/spec/unit/provider/ohai_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Provider::Ohai do
       :platform => @platform,
       :platform_version => @platform_version,
       :data => {
-        :origdata => "somevalue"      
+        :origdata => "somevalue"
       },
       :data2 => {
         :origdata => "somevalue",
@@ -49,7 +49,7 @@ describe Chef::Provider::Ohai do
     Chef::Platform.stub!(:find_platform_and_version).and_return({ "platform" => @platform,
                                                                   "platform_version" => @platform_version})
     # Fake node with a dummy save
-    @node = Chef::Node.new(@hostname)
+    @node = Chef::Node.new
     @node.name(@fqdn)
     @node.stub!(:save).and_return(@node)
     @events = Chef::EventDispatch::Dispatcher.new
@@ -57,14 +57,14 @@ describe Chef::Provider::Ohai do
     @new_resource = Chef::Resource::Ohai.new("ohai_reload")
     ohai = Ohai::System.new
     ohai.all_plugins
-    @node.process_external_attrs(ohai.data,{})
+    @node.consume_external_attrs(ohai.data,{})
 
     @provider = Chef::Provider::Ohai.new(@new_resource, @run_context)
   end
 
   describe "when reloading ohai" do
     before do
-      @node[:origdata] = 'somevalue'
+      @node.automatic_attrs[:origdata] = 'somevalue'
     end
 
     it "applies updated ohai data to the node" do

data/spec/unit/provider/package/apt_spec.rb

@@ -22,7 +22,6 @@ require 'ostruct'
 describe Chef::Provider::Package::Apt do
   before(:each) do
     @node = Chef::Node.new
-    @node.cookbook_collection = {}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Package.new("irssi", @run_context)

data/spec/unit/provider/package/ips_spec.rb

@@ -24,7 +24,6 @@ require 'ostruct'
 describe Chef::Provider::Package::Ips do
   before(:each) do
     @node = Chef::Node.new
-    @node.cookbook_collection = {}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Package.new("crypto/gnupg", @run_context)

data/spec/unit/provider/package/rubygems_spec.rb

@@ -439,7 +439,6 @@ describe Chef::Provider::Package::Rubygems do
       it "installs the gem via the gems api when no explicit options are used" do
         @provider.gem_env.should_receive(:install).with(@gem_dep, :sources => nil)
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       it "installs the gem via the gems api when a remote source is provided" do
@@ -447,14 +446,12 @@ describe Chef::Provider::Package::Rubygems do
         sources = ['http://gems.example.org']
         @provider.gem_env.should_receive(:install).with(@gem_dep, :sources => sources)
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       it "installs the gem from file via the gems api when no explicit options are used" do
         @new_resource.source(CHEF_SPEC_DATA + '/gems/chef-integration-test-0.1.0.gem')
         @provider.gem_env.should_receive(:install).with(CHEF_SPEC_DATA + '/gems/chef-integration-test-0.1.0.gem')
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       it "installs the gem from file via the gems api when the package is a path and the source is nil" do
@@ -464,7 +461,6 @@ describe Chef::Provider::Package::Rubygems do
         @new_resource.source.should == CHEF_SPEC_DATA + '/gems/chef-integration-test-0.1.0.gem'
         @provider.gem_env.should_receive(:install).with(CHEF_SPEC_DATA + '/gems/chef-integration-test-0.1.0.gem')
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       # this catches 'gem_package "foo"' when "./foo" is a file in the cwd, and instead of installing './foo' it fetches the remote gem
@@ -473,7 +469,6 @@ describe Chef::Provider::Package::Rubygems do
         @new_resource.package_name('rspec-core')
         @provider.gem_env.should_receive(:install).with(@gem_dep, :sources => nil)
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       it "installs the gem by shelling out when options are provided as a String" do
@@ -481,14 +476,12 @@ describe Chef::Provider::Package::Rubygems do
         expected ="gem install rspec-core -q --no-rdoc --no-ri -v \"#{@spec_version}\" -i /alt/install/location"
         @provider.should_receive(:shell_out!).with(expected, :env => nil)
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       it "installs the gem via the gems api when options are given as a Hash" do
         @new_resource.options(:install_dir => '/alt/install/location')
         @provider.gem_env.should_receive(:install).with(@gem_dep, :sources => nil, :install_dir => '/alt/install/location')
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       describe "at a specific version" do
@@ -499,7 +492,6 @@ describe Chef::Provider::Package::Rubygems do
         it "installs the gem via the gems api" do
           @provider.gem_env.should_receive(:install).with(@gem_dep, :sources => nil)
           @provider.action_install.should be_true
-          @provider.converge
         end
       end
       describe "at version specified with comparison operator" do
@@ -509,7 +501,6 @@ describe Chef::Provider::Package::Rubygems do
 
           @provider.gem_env.should_not_receive(:install)
           @provider.action_install
-          @provider.converge
         end
 
         it "allows user to specify gem version with fuzzy operator" do
@@ -518,7 +509,6 @@ describe Chef::Provider::Package::Rubygems do
 
           @provider.gem_env.should_not_receive(:install)
           @provider.action_install
-          @provider.converge
         end
       end
     end
@@ -528,7 +518,6 @@ describe Chef::Provider::Package::Rubygems do
         @new_resource.gem_binary('/usr/weird/bin/gem')
         @provider.should_receive(:shell_out!).with("/usr/weird/bin/gem install rspec-core -q --no-rdoc --no-ri -v \"#{@spec_version}\"", :env=>nil)
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       it "installs the gem from file by shelling out to gem install" do
@@ -537,7 +526,6 @@ describe Chef::Provider::Package::Rubygems do
         @new_resource.version('>= 0')
         @provider.should_receive(:shell_out!).with("/usr/weird/bin/gem install #{CHEF_SPEC_DATA}/gems/chef-integration-test-0.1.0.gem -q --no-rdoc --no-ri -v \">= 0\"", :env=>nil)
         @provider.action_install.should be_true
-        @provider.converge
       end
 
       it "installs the gem from file by shelling out to gem install when the package is a path and the source is nil" do
@@ -549,7 +537,6 @@ describe Chef::Provider::Package::Rubygems do
         @new_resource.source.should == CHEF_SPEC_DATA + '/gems/chef-integration-test-0.1.0.gem'
         @provider.should_receive(:shell_out!).with("/usr/weird/bin/gem install #{CHEF_SPEC_DATA}/gems/chef-integration-test-0.1.0.gem -q --no-rdoc --no-ri -v \">= 0\"", :env=>nil)
         @provider.action_install.should be_true
-        @provider.converge
       end
     end
 
@@ -572,7 +559,6 @@ describe Chef::Provider::Package::Rubygems do
         # the behavior we're testing:
         @provider.gem_env.should_receive(:uninstall).with('rspec', nil)
         @provider.action_remove
-        @provider.converge
       end
 
       it "uninstalls via the api when options are given as a Hash" do
@@ -583,21 +569,18 @@ describe Chef::Provider::Package::Rubygems do
         @new_resource.options(:install_dir => '/alt/install/location')
         @provider.gem_env.should_receive(:uninstall).with('rspec', nil, :install_dir => '/alt/install/location')
         @provider.action_remove
-        @provider.converge
       end
 
       it "uninstalls via the gem command when options are given as a String" do
         @new_resource.options('-i /alt/install/location')
         @provider.should_receive(:shell_out!).with("gem uninstall rspec -q -x -I -a -i /alt/install/location", :env=>nil)
         @provider.action_remove
-        @provider.converge
       end
 
       it "uninstalls a specific version of a gem when a version is provided" do
         @new_resource.version('1.2.3')
         @provider.gem_env.should_receive(:uninstall).with('rspec', '1.2.3')
         @provider.action_remove
-        @provider.converge
       end
     end
 
@@ -606,7 +589,6 @@ describe Chef::Provider::Package::Rubygems do
         @new_resource.gem_binary('/usr/weird/bin/gem')
         @provider.should_receive(:shell_out!).with("/usr/weird/bin/gem uninstall rspec -q -x -I -a", :env=>nil)
         @provider.action_remove
-        @provider.converge
       end
     end
   end

data/spec/unit/provider/package/yum_spec.rb

@@ -34,7 +34,8 @@ describe Chef::Provider::Package::Yum do
       :package_available? => true,
       :version_available? => true,
       :allow_multi_install => [ "kernel" ],
-      :package_repository => "base" 
+      :package_repository => "base",
+      :disable_extra_repo_control => true
     )
     Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
     @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -92,6 +93,7 @@ describe Chef::Provider::Package::Yum do
           end
         end
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
@@ -125,6 +127,7 @@ describe Chef::Provider::Package::Yum do
           nil
         end
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         # annoying side effect of the fun stub'ing above
@@ -155,6 +158,7 @@ describe Chef::Provider::Package::Yum do
           nil
         end
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
@@ -189,6 +193,7 @@ describe Chef::Provider::Package::Yum do
           end
         end.and_return("something")
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
@@ -209,6 +214,24 @@ describe Chef::Provider::Package::Yum do
       @provider.load_current_resource
     end
 
+    it "should detect --enablerepo or --disablerepo when passed among options, collect them preserving order and notify the yum cache" do
+      @new_resource.stub!(:options).and_return("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c  --enablerepo=bar")
+      @yum_cache.should_receive(:enable_extra_repo_control).with("--enablerepo=foo --disablerepo=a,b,c --enablerepo=bar")
+      @provider.load_current_resource
+    end
+
+    it "should let the yum cache know extra repos are disabled if --enablerepo or --disablerepo aren't among options" do
+      @new_resource.stub!(:options).and_return("--stuff --otherthings")
+      @yum_cache.should_receive(:disable_extra_repo_control)
+      @provider.load_current_resource
+    end
+
+    it "should let the yum cache know extra repos are disabled if options aren't set" do
+      @new_resource.stub!(:options).and_return(nil)
+      @yum_cache.should_receive(:disable_extra_repo_control)
+      @provider.load_current_resource
+    end
+
     it "should search provides if package name can't be found then set package_name to match" do
       @yum_cache = mock(
         'Chef::Provider::Yum::YumCache',
@@ -217,7 +240,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       pkg = Chef::Provider::Package::Yum::RPMPackage.new("test-package", "1.2.4-11.18.el5", "x86_64", [])
@@ -235,7 +259,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       pkg_x = Chef::Provider::Package::Yum::RPMPackage.new("test-package-x", "1.2.4-11.18.el5", "x86_64", [])
@@ -255,7 +280,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @yum_cache.should_receive(:packages_from_require).twice.and_return([])
@@ -272,7 +298,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -295,7 +322,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @yum_cache.should_receive(:packages_from_require).twice.and_return([])
@@ -363,7 +391,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5_2.3",
         :package_available? => true,
-        :version_available? => nil
+        :version_available? => nil,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -380,7 +409,8 @@ describe Chef::Provider::Package::Yum do
         :candidate_version => "1.2.4-11.15.el5",
         :package_available? => true,
         :version_available? => true,
-        :allow_multi_install => [ "kernel" ]
+        :allow_multi_install => [ "kernel" ],
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -398,7 +428,8 @@ describe Chef::Provider::Package::Yum do
         :package_available? => true,
         :version_available? => true,
         :allow_multi_install => [ "cups" ],
-        :package_repository => "base"
+        :package_repository => "base",
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -420,7 +451,8 @@ describe Chef::Provider::Package::Yum do
         :package_available? => true,
         :version_available? => true,
         :allow_multi_install => [],
-        :package_repository => "base"
+        :package_repository => "base",
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -485,7 +517,8 @@ describe Chef::Provider::Package::Yum do
         :candidate_version => "1.2.4-11.15.el5",
         :package_available? => true,
         :version_available? => true,
-        :allow_multi_install => [ "kernel" ]
+        :allow_multi_install => [ "kernel" ],
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -504,7 +537,6 @@ describe Chef::Provider::Package::Yum do
         "11"
       )
       @provider.action_upgrade
-      @provider.converge
     end
 
     it "should call action_upgrade in the parent if the candidate version is nil" do
@@ -513,7 +545,6 @@ describe Chef::Provider::Package::Yum do
       @provider.candidate_version = nil 
       @provider.should_not_receive(:upgrade_package)
       @provider.action_upgrade
-      @provider.converge
     end
 
     it "should call action_upgrade in the parent if the candidate is newer" do
@@ -525,7 +556,6 @@ describe Chef::Provider::Package::Yum do
         "11"
       )
       @provider.action_upgrade
-      @provider.converge
     end
 
     it "should not call action_upgrade in the parent if the candidate is older" do
@@ -535,7 +565,6 @@ describe Chef::Provider::Package::Yum do
       @provider.candidate_version = '11'
       @provider.should_not_receive(:upgrade_package)
       @provider.action_upgrade
-      @provider.converge
     end
   end
 
@@ -1613,6 +1642,12 @@ EOF
       @yc.refresh
     end
 
+    it "should pass extra_repo_control args to yum-dump.py" do
+      @yc.enable_extra_repo_control("--enablerepo=foo --disablerepo=bar")
+      @yc.should_receive(:popen4).with(%r{^/usr/bin/python .*/yum-dump.py --options --installed-provides --enablerepo=foo --disablerepo=bar$}, :waitlast=>true)
+      @yc.refresh
+    end
+
     it "should warn about invalid data with too many separators" do
       @yc.stub!(:popen4).and_yield(@pid, @stdin, @stdout_bad_separators, @stderr).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(3).times.with(%r{Problem parsing})
@@ -1792,4 +1827,33 @@ EOF
     end
   end
 
+  describe "enable_extra_repo_control" do
+    it "should set @extra_repo_control to arg" do
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.extra_repo_control.should be == "--enablerepo=test"
+    end
+
+    it "should call reload once when set to flag cache for update" do
+      @yc.should_receive(:reload).once
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.enable_extra_repo_control("--enablerepo=test")
+    end
+  end
+
+  describe "disable_extra_repo_control" do
+    it "should set @extra_repo_control to nil" do
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.disable_extra_repo_control
+      @yc.extra_repo_control.should be == nil
+    end
+
+    it "should call reload once when cleared to flag cache for update" do
+      @yc.should_receive(:reload).once
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.should_receive(:reload).once
+      @yc.disable_extra_repo_control
+      @yc.disable_extra_repo_control
+    end
+  end
+
 end