diff options
Diffstat (limited to 'test/executables')
| -rwxr-xr-x | test/executables/tc_puppetca.rb | 4 | ||||
| -rwxr-xr-x | test/executables/tc_puppetd.rb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/executables/tc_puppetca.rb b/test/executables/tc_puppetca.rb index 61b83b178..2fed58557 100755 --- a/test/executables/tc_puppetca.rb +++ b/test/executables/tc_puppetca.rb @@ -49,7 +49,9 @@ class TestPuppetCA < Test::Unit::TestCase cert = mkcert("host.test.com") resp = nil assert_nothing_raised { - resp = ca.getcert(cert.csr.to_pem) + # We need to use a fake name so it doesn't think the cert is from + # itself. + resp = ca.getcert(cert.csr.to_pem, "fakename", "127.0.0.1") } assert_equal(["",""], resp) #Puppet.warning "SSLDir is %s" % Puppet[:ssldir] diff --git a/test/executables/tc_puppetd.rb b/test/executables/tc_puppetd.rb index e7a55b480..72cf1f031 100755 --- a/test/executables/tc_puppetd.rb +++ b/test/executables/tc_puppetd.rb @@ -36,7 +36,7 @@ class TestPuppetDExe < Test::Unit::TestCase cmd = "puppetd" cmd += " --verbose" - cmd += " --fqdn %s" % fqdn + #cmd += " --fqdn %s" % fqdn cmd += " --port %s" % @@port cmd += " --ssldir %s" % Puppet[:ssldir] cmd += " --server localhost" @@ -44,11 +44,10 @@ class TestPuppetDExe < Test::Unit::TestCase # and verify our daemon runs assert_nothing_raised { output = %x{#{cmd}}.chomp + puts output } sleep 1 assert($? == 0, "Puppetd exited with code %s" % $?) - #puts output - #assert_equal("", output, "Puppetd produced output %s" % output) assert(FileTest.exists?(@createdfile), "Failed to create config'ed file") |