Setting pluginsync default to false, and (hopefully) fixing autosign problem when the file exists and autosign is set to true (#180). The problem was that the puppetmasterd script was redundantly setting autosign in the CA, when the CA already knows how to deal with autosigning, which meant that autosign was being set before the config was parsed. Thus, there was no bug when autosign was set on the command line but there was when it was set in the config.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1304 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 6 insertions, 1 deletions

diff --git a/test/puppettest.rb b/test/puppettest.rb
index c65c95f49..6bdc41a75 100644
--- a/test/puppettest.rb
+++ b/test/puppettest.rb
@@ -462,6 +462,11 @@ module ExeTest
         assert($? == 0, "Puppetmasterd exit status was %s" % $?)
         sleep(1)
 
+        cleanup do
+            stopmasterd
+            sleep(1)
+        end
+
         return manifest
     end
 
@@ -483,7 +488,7 @@ module ExeTest
                 if line =~ /ruby.+puppetmasterd/
                     next if line =~ /\.rb/ # skip the test script itself
                     ary = line.sub(/^\s+/, '').split(/\s+/)
-                    runningpid = ary[1].to_i
+                    pid = ary[1].to_i
                 end
             }