diff options
| author | jtimberman <joshua@opscode.com> | 2012-08-22 16:00:38 -0600 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2012-08-27 12:19:25 -0700 |
| commit | 233407926a567ee9b5df169b5ae478803ff3dd5e (patch) | |
| tree | 17fa14b30a689f669b1d0c94a118ba3ce9de2903 | |
| parent | b6c6342cb91cfb45cd80684b177f9980bac63786 (diff) | |
| download | chef-233407926a567ee9b5df169b5ae478803ff3dd5e.tar.gz | |
[CHEF-3383] - regression in cookbook site share
* Chef::CookbookUpload#validate_cookbook was changed to
#validate_cookbooks
* The cookbook site share command was not updated for the method
* The spec stubbed the return of #validate_cookbook as true meaning it
wouldn't have tested this change.
| -rw-r--r-- | chef/lib/chef/knife/cookbook_site_share.rb | 2 | ||||
| -rw-r--r-- | chef/spec/unit/knife/cookbook_site_share_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chef/lib/chef/knife/cookbook_site_share.rb b/chef/lib/chef/knife/cookbook_site_share.rb index 61177fa3dc..77c4895dcc 100644 --- a/chef/lib/chef/knife/cookbook_site_share.rb +++ b/chef/lib/chef/knife/cookbook_site_share.rb @@ -50,7 +50,7 @@ class Chef cl = Chef::CookbookLoader.new(config[:cookbook_path]) if cl.cookbook_exists?(cookbook_name) cookbook = cl[cookbook_name] - Chef::CookbookUploader.new(cookbook,config[:cookbook_path]).validate_cookbook + Chef::CookbookUploader.new(cookbook,config[:cookbook_path]).validate_cookbooks tmp_cookbook_dir = Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook) begin Chef::Log.debug("Temp cookbook directory is #{tmp_cookbook_dir.inspect}") diff --git a/chef/spec/unit/knife/cookbook_site_share_spec.rb b/chef/spec/unit/knife/cookbook_site_share_spec.rb index f66da08a10..3b912af0c5 100644 --- a/chef/spec/unit/knife/cookbook_site_share_spec.rb +++ b/chef/spec/unit/knife/cookbook_site_share_spec.rb @@ -36,7 +36,7 @@ describe Chef::Knife::CookbookSiteShare do @cookbook_uploader = Chef::CookbookUploader.new('herpderp', File.join(CHEF_SPEC_DATA, 'cookbooks'), :rest => "norest") Chef::CookbookUploader.stub!(:new).and_return(@cookbook_uploader) - @cookbook_uploader.stub!(:validate_cookbook).and_return(true) + @cookbook_uploader.stub!(:validate_cookbooks).and_return(true) Chef::CookbookSiteStreamingUploader.stub!(:create_build_dir).and_return(Dir.mktmpdir) Chef::Mixin::Command.stub(:run_command).and_return(true) |