3775875a42
The client, merger and server share common code. Factor it out to the
new class zuul.cmd.ZuulApp().
* Moved stack_dump_handler there. It is still a function.
* setup_logging() is shared by merger and server. The client simply
override it (--verbose simply set the debug level). We might want one
day to have the client look at zuul.conf for its logging
configuration.
* The merger now reports the Zuul version via the argparse action
'version'. The action asks argparse to invokes a method, print its
result and exit immediately. That brings it on par with client and
server which have been using that action since commit aabb686b
* Client.gear_server_pid property is gone. Seems to be a left over when
the client got created out of the server code.
Change-Id: I0a3984a5650408ac5f5d6ecdb7518c339b392492
35 lines
1.1 KiB
Python
35 lines
1.1 KiB
Python
# Copyright 2013 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import fixtures
|
|
import logging
|
|
import signal
|
|
import testtools
|
|
|
|
import zuul.cmd
|
|
|
|
|
|
class TestStackDump(testtools.TestCase):
|
|
def setUp(self):
|
|
super(TestStackDump, self).setUp()
|
|
self.log_fixture = self.useFixture(
|
|
fixtures.FakeLogger(level=logging.DEBUG))
|
|
|
|
def test_stack_dump_logs(self):
|
|
"Test that stack dumps end up in logs."
|
|
|
|
zuul.cmd.stack_dump_handler(signal.SIGUSR2, None)
|
|
self.assertIn("Thread", self.log_fixture.output)
|
|
self.assertIn("test_stack_dump_logs", self.log_fixture.output)
|