summaryrefslogtreecommitdiffstats
path: root/test/executables
diff options
context:
space:
mode:
Diffstat (limited to 'test/executables')
-rwxr-xr-xtest/executables/puppetmasterd.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 691e27070..cbf8ac02a 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -92,6 +92,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
pid = nil
ps = Facter["ps"].value || "ps -ef"
%x{#{ps}}.chomp.split(/\n/).each { |line|
+ next if line =~ /^puppet/ # skip normal master procs
if line =~ /puppetmasterd.+--manifest/
ary = line.split(" ")
pid = ary[1].to_i