diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-28 05:39:59 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-28 05:39:59 +0000 |
| commit | b6c63f6924250a14e998f4256e81c30e950fed99 (patch) | |
| tree | 8915ec8881f2389b208dfda27a12d11f69730398 /test/executables | |
| parent | 0ae5e3392597452acf6a2e9f0d4ac976b8ec9846 (diff) | |
| download | puppet-b6c63f6924250a14e998f4256e81c30e950fed99.tar.gz puppet-b6c63f6924250a14e998f4256e81c30e950fed99.tar.xz puppet-b6c63f6924250a14e998f4256e81c30e950fed99.zip | |
Central logging now works, although there appear to be a few kinks to work out.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@732 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/executables')
| -rwxr-xr-x | test/executables/puppetmasterd.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb index 6b67e5e37..a80190d00 100755 --- a/test/executables/puppetmasterd.rb +++ b/test/executables/puppetmasterd.rb @@ -29,6 +29,10 @@ class TestPuppetMasterD < Test::Unit::TestCase def test_normalstart startmasterd + pidfile = File.join(Puppet[:puppetvar], "puppetmasterd.pid") + assert(FileTest.exists?(pidfile), "PID file does not exist") + + sleep(1) assert_nothing_raised { socket = TCPSocket.new("127.0.0.1", @@port) socket.close @@ -86,7 +90,7 @@ class TestPuppetMasterD < Test::Unit::TestCase # verify that we can run puppetmasterd in parse-only mode def test_parseonly - startmasterd("--parseonly") + startmasterd("--parseonly > /dev/null") sleep(1) pid = nil |