summaryrefslogtreecommitdiffstats
path: root/test/executables
diff options
context:
space:
mode:
Diffstat (limited to 'test/executables')
-rwxr-xr-xtest/executables/puppetmasterd.rb6
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