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/puppetmasterd.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/puppetmasterd.rb')
| -rwxr-xr-x | test/executables/puppetmasterd.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb index e1f48c11b..691e27070 100755 --- a/test/executables/puppetmasterd.rb +++ b/test/executables/puppetmasterd.rb @@ -27,7 +27,7 @@ class TestPuppetMasterD < Test::Unit::TestCase def test_normalstart startmasterd - pidfile = File.join(Puppet[:puppetvar], "run", "puppetmasterd.pid") + pidfile = File.join(Puppet[:vardir], "run", "puppetmasterd.pid") assert(FileTest.exists?(pidfile), "PID file does not exist") sleep(1) @@ -92,7 +92,7 @@ class TestPuppetMasterD < Test::Unit::TestCase pid = nil ps = Facter["ps"].value || "ps -ef" %x{#{ps}}.chomp.split(/\n/).each { |line| - if line =~ /puppetmasterd --manifest/ + if line =~ /puppetmasterd.+--manifest/ ary = line.split(" ") pid = ary[1].to_i end |