summaryrefslogtreecommitdiffstats
path: root/test/executables/puppetbin.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-02-07 23:12:33 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-02-07 23:12:33 +0000
commitb98e65f1fd858a1d0af415554db49a121a76232c (patch)
tree728f94dd17f88902c6bdf21ff6b17486babb08af /test/executables/puppetbin.rb
parentf1ffc34c0927840beeb21e1e2d864ce14de5d15e (diff)
downloadpuppet-b98e65f1fd858a1d0af415554db49a121a76232c.tar.gz
puppet-b98e65f1fd858a1d0af415554db49a121a76232c.tar.xz
puppet-b98e65f1fd858a1d0af415554db49a121a76232c.zip
There is now full support for configuration files, and the entire system has been modified to expect their new behaviour. I have not yet run the test across all test hosts, though.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@873 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/executables/puppetbin.rb')
-rwxr-xr-xtest/executables/puppetbin.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 9fb4dbd11..39814769c 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -30,8 +30,8 @@ class TestPuppetBin < Test::Unit::TestCase
cmd += " --debug"
end
#cmd += " --fqdn %s" % fqdn
- cmd += " --confdir %s" % Puppet[:puppetconf]
- cmd += " --vardir %s" % Puppet[:puppetvar]
+ cmd += " --confdir %s" % Puppet[:confdir]
+ cmd += " --vardir %s" % Puppet[:vardir]
cmd += " --logdest %s" % "/dev/null"
assert_nothing_raised {