summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2014-09-29 19:54:32 -0700
committerJay Mundrawala <jdmundrawala@gmail.com>2014-09-29 19:54:32 -0700
commitbeef8992ba2be6a50327247a8e2d100728931cf1 (patch)
tree9cfcb43436996f8ca8e542e2e9c7ed5d579b86b2
parent4098cf801f8d991ab163f5ce21b81c7807dde6ff (diff)
downloadchef-beef8992ba2be6a50327247a8e2d100728931cf1.tar.gz
Make knife bootstrap unit test pass on windows
-rw-r--r--spec/unit/knife/bootstrap_spec.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb
index d5c668753e..70cdd20f35 100644
--- a/spec/unit/knife/bootstrap_spec.rb
+++ b/spec/unit/knife/bootstrap_spec.rb
@@ -22,6 +22,9 @@ Chef::Knife::Bootstrap.load_deps
require 'net/ssh'
describe Chef::Knife::Bootstrap do
+ before do
+ Chef::Platform.stub(:windows?) { false }
+ end
let(:knife) do
Chef::Log.logger = Logger.new(StringIO.new)
Chef::Config[:knife][:bootstrap_template] = bootstrap_template unless bootstrap_template.nil?
@@ -310,7 +313,7 @@ describe Chef::Knife::Bootstrap do
end
describe "when transferring trusted certificates" do
- let(:trusted_certs_dir) { File.join(CHEF_SPEC_DATA, 'trusted_certs') }
+ let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(File.dirname(__FILE__), '../../data/trusted_certs')) }
let(:rendered_template) do
knife.merge_configs