summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2014-10-21 09:26:34 -0700
committerSerdar Sutay <serdar@opscode.com>2014-10-21 09:26:34 -0700
commitc38f704f5fff50c5e5254add9593cbd83b06a8a2 (patch)
tree5e816cb5fb4a45cea9584e3d23e6c03effc702f5
parent2fcc10204cc6317b5e9303467ff8afe5e520aa00 (diff)
parentf11d1c3309788adb53ddbee8ffa80e460ab368a2 (diff)
downloadchef-c38f704f5fff50c5e5254add9593cbd83b06a8a2.tar.gz
Merge pull request #2266 from opscode/sersut/chef-rc-fixes-2
Missed one spec in rpm_spec.rb.
-rw-r--r--spec/functional/resource/rpm_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/functional/resource/rpm_spec.rb b/spec/functional/resource/rpm_spec.rb
index 2e452d7e2e..b37ee781f1 100644
--- a/spec/functional/resource/rpm_spec.rb
+++ b/spec/functional/resource/rpm_spec.rb
@@ -102,11 +102,11 @@ describe Chef::Resource::RpmPackage, :requires_root, :external => exclude_test d
if ohai[:platform] == 'aix'
@pkg_version = "2-0"
@pkg_path = "/tmp/dummy-2-0.aix6.1.noarch.rpm"
- FileUtils.cp 'spec/functional/assets/dummy-2-0.aix6.1.noarch.rpm' , @pkg_path
+ FileUtils.cp(File.join(CHEF_SPEC_ASSETS, 'dummy-2-0.aix6.1.noarch.rpm') , @pkg_path)
else
@pkg_version = "2.0-1"
@pkg_path = "/tmp/mytest-2.0-1.noarch.rpm"
- FileUtils.cp 'spec/functional/assets/mytest-2.0-1.noarch.rpm' , @pkg_path
+ FileUtils.cp(File.join(CHEF_SPEC_ASSETS, 'mytest-2.0-1.noarch.rpm') , @pkg_path)
end
end