diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-18 16:44:55 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-18 16:44:55 -0600 |
| commit | 1ada24d4d4aa9ccd9a37176aa3d105ec9874d208 (patch) | |
| tree | 37b91702f5a4553ed2083d02ced934cfa762834c /test/executables | |
| parent | 933b1df6d84ec34a6ff347240c0151434ecc80a9 (diff) | |
| download | puppet-1ada24d4d4aa9ccd9a37176aa3d105ec9874d208.tar.gz puppet-1ada24d4d4aa9ccd9a37176aa3d105ec9874d208.tar.xz puppet-1ada24d4d4aa9ccd9a37176aa3d105ec9874d208.zip | |
Fixing some tests that were failing with the recent ruby that has
ssl issues.
Diffstat (limited to 'test/executables')
| -rwxr-xr-x | test/executables/puppetd.rb | 2 | ||||
| -rwxr-xr-x | test/executables/puppetmasterd.rb | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb index 3dd3856fd..d770ff91e 100755 --- a/test/executables/puppetd.rb +++ b/test/executables/puppetd.rb @@ -12,9 +12,11 @@ class TestPuppetDExe < Test::Unit::TestCase include PuppetTest::ExeTest def setup super + Puppet[:certdnsnames] = "localhost" # start the master @manifest = startmasterd + @cmd = "puppetd" @cmd += " --verbose" @cmd += " --test" diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb index 16f7f0f5c..6d4ddf56f 100755 --- a/test/executables/puppetmasterd.rb +++ b/test/executables/puppetmasterd.rb @@ -9,6 +9,11 @@ require 'socket' class TestPuppetMasterD < Test::Unit::TestCase include PuppetTest::ExeTest + def setup + super + Puppet[:certdnsnames] = "localhost" + end + def getcerts include Puppet::Daemon if self.readcerts |