diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-16 04:14:32 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-16 04:14:32 +0000 |
| commit | ac0454a4bfcf6e9ecd3f3eb6037f04caa3c3ce59 (patch) | |
| tree | 200749a544b99507b6d6ff0347df03aaa7cf82db /test/server | |
| parent | f7116e58714d9c66409acfc836ba271957b1b2af (diff) | |
| download | puppet-ac0454a4bfcf6e9ecd3f3eb6037f04caa3c3ce59.tar.gz puppet-ac0454a4bfcf6e9ecd3f3eb6037f04caa3c3ce59.tar.xz puppet-ac0454a4bfcf6e9ecd3f3eb6037f04caa3c3ce59.zip | |
making "Type.new" private, and switching to "Type.create", so that i can merge new objects with existing objects and such; converted all files, and tested them
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@674 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/server')
| -rw-r--r-- | test/server/tc_server.rb | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/test/server/tc_server.rb b/test/server/tc_server.rb index 988a1e17a..b0afc6398 100644 --- a/test/server/tc_server.rb +++ b/test/server/tc_server.rb @@ -27,50 +27,6 @@ class TestServer < ServerTest print "\n\n\n\n" if Puppet[:debug] end - # just do a simple start test - def test_start - Puppet[:autosign] = true - server = nil - # make a test manifest - file = mktestmanifest() - - # create a simple server - # we can use threading here because we're not talking to the server, - # just starting and stopping it - assert_nothing_raised() { - server = Puppet::Server.new( - :Port => @@port, - :Handlers => { - :CA => {}, # so that certs autogenerate - :Master => { - :File => file, - }, - :Status => nil - } - ) - - } - - # start it - sthread = nil - assert_nothing_raised() { - trap(:INT) { server.shutdown } - sthread = Thread.new { - server.start - } - } - - # and stop it - assert_nothing_raised { - server.shutdown - } - - # and then wait - assert_nothing_raised { - sthread.join - } - end - # test that we can connect to the server # we have to use fork here, because we apparently can't use threads # to talk to other threads |
