diff options
author | Julian C. Dunn <jdunn@getchef.com> | 2014-06-30 13:35:07 -0400 |
---|---|---|
committer | Julian C. Dunn <jdunn@getchef.com> | 2014-06-30 13:35:07 -0400 |
commit | 1ee424ed7540414f0b8297bad1058cfd887f6aac (patch) | |
tree | 9414e1bf73075c425f4685357898e7d989a204e1 /spec/integration/knife/cookbook_api_ipv6_spec.rb | |
parent | 2ed829e661f9a357fc9a8cdf316c84f077dad7f9 (diff) | |
download | chef-1ee424ed7540414f0b8297bad1058cfd887f6aac.tar.gz |
Make sure to call chef-client and knife that we just built, notbtm/fix-hardcoded-binaries
just some random ones hanging around in $PATH.
Diffstat (limited to 'spec/integration/knife/cookbook_api_ipv6_spec.rb')
-rw-r--r-- | spec/integration/knife/cookbook_api_ipv6_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/integration/knife/cookbook_api_ipv6_spec.rb b/spec/integration/knife/cookbook_api_ipv6_spec.rb index ad7d5e857f..d1284b65bf 100644 --- a/spec/integration/knife/cookbook_api_ipv6_spec.rb +++ b/spec/integration/knife/cookbook_api_ipv6_spec.rb @@ -62,6 +62,7 @@ END_VALIDATION_PEM end let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") } + let(:knife) { "ruby #{chef_dir}/knife" } let(:knife_config_flag) { "-c '#{path_to("config/knife.rb")}'" } @@ -88,7 +89,7 @@ END_CLIENT_RB end it "successfully uploads a cookbook" do - shell_out!("knife cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir) + shell_out!("#{knife} cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir) versions_list_json = Chef::HTTP::Simple.new("http://[::1]:8900").get("/cookbooks/apache2", "accept" => "application/json") versions_list = Chef::JSONCompat.from_json(versions_list_json) versions_list["apache2"]["versions"].should_not be_empty @@ -96,7 +97,7 @@ END_CLIENT_RB context "and the cookbook has been uploaded to the server" do before do - shell_out!("knife cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir) + shell_out!("#{knife} cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir) end it "downloads the cookbook" do |