diff options
| -rw-r--r-- | spec/functional/application_spec.rb | 6 | ||||
| -rw-r--r-- | spec/unit/provider/mount/solaris_spec.rb | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/spec/functional/application_spec.rb b/spec/functional/application_spec.rb index a1d69a9e8f..4a0fdff8f8 100644 --- a/spec/functional/application_spec.rb +++ b/spec/functional/application_spec.rb @@ -47,12 +47,12 @@ describe Chef::Application do it "saves built proxy to ENV which shell_out can use" do so = if windows? - shell_out("echo %HTTP_PROXY%") + shell_out("echo %http_proxy%") else - shell_out("echo %HTTP_PROXY%") + shell_out("echo $http_proxy") end - so.stdout.should == "http://proxy.example.org:8080\n" + so.stdout.chomp.should == "http://proxy.example.org:8080" end end end diff --git a/spec/unit/provider/mount/solaris_spec.rb b/spec/unit/provider/mount/solaris_spec.rb index e7dd17c746..5d328c2edc 100644 --- a/spec/unit/provider/mount/solaris_spec.rb +++ b/spec/unit/provider/mount/solaris_spec.rb @@ -19,7 +19,9 @@ require 'spec_helper' require 'ostruct' -describe Chef::Provider::Mount::Solaris do +# Do not run these tests on windows because some path handling +# code is not implemented to handle windows paths. +describe Chef::Provider::Mount::Solaris, :unix_only do let(:node) { Chef::Node.new } let(:events) { Chef::EventDispatch::Dispatcher.new } |