summaryrefslogtreecommitdiffstats
path: root/test/executables
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-07 18:13:36 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-07 18:13:36 +0000
commit923226e7ac5d931dc6b01f5ae1cee3beb24b2fee (patch)
treee3d3372bce6fdf719928e51f43fd8248a12241ec /test/executables
parentedc392d7f5b8fb59fff17091612da01a5a52891d (diff)
downloadpuppet-923226e7ac5d931dc6b01f5ae1cee3beb24b2fee.tar.gz
puppet-923226e7ac5d931dc6b01f5ae1cee3beb24b2fee.tar.xz
puppet-923226e7ac5d931dc6b01f5ae1cee3beb24b2fee.zip
all tests now pass on solaris 10x86; i had to do some stupid hacking with base64 for it to work, and i am working getting a much better base class for all test classes
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@635 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/executables')
-rwxr-xr-xtest/executables/tc_puppetmasterd.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/executables/tc_puppetmasterd.rb b/test/executables/tc_puppetmasterd.rb
index 7f79f3ee5..6d4a58b7b 100755
--- a/test/executables/tc_puppetmasterd.rb
+++ b/test/executables/tc_puppetmasterd.rb
@@ -61,6 +61,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
pid = nil
%x{#{ps}}.chomp.split(/\n/).each { |line|
if line =~ /ruby.+puppetmasterd/
+ next if line =~ /tc_/ # skip the test script itself
ary = line.split(" ")
pid = ary[1].to_i
end