summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlamont-granquist <lamont@scriptkiddie.org>2013-09-25 15:06:53 -0700
committerlamont-granquist <lamont@scriptkiddie.org>2013-09-25 15:06:53 -0700
commit61e98b94fb387353841d5b4575816a1d716cfbc9 (patch)
treefa8aab8d64312ee35f8ffcd97089ce933811f388
parent031bce02c29fd9a2811ad9b63692e1d880e35e84 (diff)
parenta9ff6c6e2abdd977c45c82814a2f9ed78795a7ed (diff)
downloadchef-61e98b94fb387353841d5b4575816a1d716cfbc9.tar.gz
Merge pull request #1011 from opscode/lcg/runlock-spec-fix
file cache location changes on windows
-rw-r--r--spec/unit/run_lock_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/unit/run_lock_spec.rb b/spec/unit/run_lock_spec.rb
index e054c4899c..de302dc533 100644
--- a/spec/unit/run_lock_spec.rb
+++ b/spec/unit/run_lock_spec.rb
@@ -20,10 +20,12 @@ require 'chef/client'
describe Chef::RunLock do
+ default_pid_location = windows? ? 'C:\chef\cache\chef-client-running.pid' : '/var/chef/cache/chef-client-running.pid'
+
describe "when first created" do
it "locates the lockfile in the file cache path by default" do
run_lock = Chef::RunLock.new(Chef::Config.lockfile)
- run_lock.runlock_file.should == "/var/chef/cache/chef-client-running.pid"
+ run_lock.runlock_file.should == default_pid_location
end
it "locates the lockfile in the user-configured path when set" do