summaryrefslogtreecommitdiffstats
path: root/test/ral/manager
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-11-04 13:53:23 -0700
committerJames Turnbull <james@lovedthanlost.net>2010-11-12 15:02:00 +1100
commitb15231df5842df2ea83b779b22e6756e51bc39d0 (patch)
tree34978db4a199ccca92e35c66e154851bc60fff27 /test/ral/manager
parentea435a43dc97487d054271a9efb208f361408339 (diff)
downloadpuppet-b15231df5842df2ea83b779b22e6756e51bc39d0.tar.gz
puppet-b15231df5842df2ea83b779b22e6756e51bc39d0.tar.xz
puppet-b15231df5842df2ea83b779b22e6756e51bc39d0.zip
Fix for #4299 -- Don't require which
We already had an internal implementation of which hiding under an assumed name (Puppet::Util.binary); this commit calls it out of hiding and uses it consisantly.
Diffstat (limited to 'test/ral/manager')
-rwxr-xr-xtest/ral/manager/type.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/ral/manager/type.rb b/test/ral/manager/type.rb
index 7df643005..145877722 100755
--- a/test/ral/manager/type.rb
+++ b/test/ral/manager/type.rb
@@ -276,7 +276,7 @@ class TestType < Test::Unit::TestCase
def test_isomorphic_names
catalog = mk_catalog
# First do execs, since they're not isomorphic.
- echo = Puppet::Util.binary "echo"
+ echo = Puppet::Util.which "echo"
exec1 = exec2 = nil
assert_nothing_raised do