diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-19 16:33:03 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-19 16:33:03 -0600 |
| commit | 7e0e6c0dffb5158bd606e2dc83824bbfed998cbb (patch) | |
| tree | 25cfde1d4a704b8ae04bc701b0d7d3c3127d4fc9 | |
| parent | 1bf3999ec08f41e35036b303914987e2c0174922 (diff) | |
| parent | 59626cb3907d36e4fd762277daa76f523faf0908 (diff) | |
| download | puppet-7e0e6c0dffb5158bd606e2dc83824bbfed998cbb.tar.gz puppet-7e0e6c0dffb5158bd606e2dc83824bbfed998cbb.tar.xz puppet-7e0e6c0dffb5158bd606e2dc83824bbfed998cbb.zip | |
Merge commit 'davids-bugfixes/tests/fix-test-client-ca'
| -rw-r--r-- | test/lib/puppettest/servertest.rb | 1 | ||||
| -rwxr-xr-x | test/network/handler/bucket.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb index 11c24f5b4..2d1672944 100644 --- a/test/lib/puppettest/servertest.rb +++ b/test/lib/puppettest/servertest.rb @@ -33,6 +33,7 @@ module PuppetTest::ServerTest # create a server, forked into the background def mkserver(handlers = nil) Puppet[:name] = "puppetmasterd" + Puppet[:ssldir] = "/tmp/ssl" # our default handlers unless handlers handlers = { diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb index 6b28fdb72..d72206e29 100755 --- a/test/network/handler/bucket.rb +++ b/test/network/handler/bucket.rb @@ -214,6 +214,7 @@ class TestBucket < Test::Unit::TestCase FileUtils.mkdir_p(tmpdir) Puppet[:autosign] = true + Puppet[:certname] = "localhost" client = nil port = Puppet[:masterport] |