summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Doherty <randomcamel@users.noreply.github.com>2014-09-18 22:28:31 -0700
committerChris Doherty <randomcamel@users.noreply.github.com>2014-09-18 22:28:31 -0700
commit5534b5d0f781188e0398d5b1ade7ceba568e4b45 (patch)
tree7e66a8c9354728b339b1645ed3c3471bc951921a
parente60d16d1cb9378d8927207080494736c4c3609c2 (diff)
parent1a2e63b136e5e6cb42f212b76b61763512588125 (diff)
downloadchef-5534b5d0f781188e0398d5b1ade7ceba568e4b45.tar.gz
Merge pull request #2088 from opscode/cdoherty-fix-jenkins-12.04-error
Fix test failure happening only on Jenkins 12.04+1.9.3: don't call File....
-rw-r--r--spec/unit/workstation_config_loader_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/workstation_config_loader_spec.rb b/spec/unit/workstation_config_loader_spec.rb
index d1e352602d..de108ff6d7 100644
--- a/spec/unit/workstation_config_loader_spec.rb
+++ b/spec/unit/workstation_config_loader_spec.rb
@@ -241,7 +241,7 @@ describe Chef::WorkstationConfigLoader do
t.path
end
- after { File.unlink(explicit_config_location) }
+ after { File.unlink(explicit_config_location) if File.exists?(explicit_config_location) }
context "and is valid" do