diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-07 23:12:33 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-07 23:12:33 +0000 |
| commit | b98e65f1fd858a1d0af415554db49a121a76232c (patch) | |
| tree | 728f94dd17f88902c6bdf21ff6b17486babb08af /test/executables/puppetd.rb | |
| parent | f1ffc34c0927840beeb21e1e2d864ce14de5d15e (diff) | |
| download | puppet-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/puppetd.rb')
| -rwxr-xr-x | test/executables/puppetd.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb index 90733ed19..1ac53db16 100755 --- a/test/executables/puppetd.rb +++ b/test/executables/puppetd.rb @@ -27,15 +27,14 @@ class TestPuppetDExe < Test::Unit::TestCase cmd += " --verbose" cmd += " --onetime" #cmd += " --fqdn %s" % fqdn - cmd += " --port %s" % @@port - cmd += " --confdir %s" % Puppet[:puppetconf] - cmd += " --vardir %s" % Puppet[:puppetvar] + cmd += " --masterport %s" % @@port + cmd += " --confdir %s" % Puppet[:confdir] + cmd += " --vardir %s" % Puppet[:vardir] cmd += " --server localhost" # and verify our daemon runs assert_nothing_raised { - output = %x{#{cmd}}.chomp - puts output + system cmd } sleep 1 assert($? == 0, "Puppetd exited with code %s" % $?) |