diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-25 13:41:48 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-25 13:44:21 -0500 |
| commit | 4568c44372c99ba809826e016680da9b881bd8e8 (patch) | |
| tree | e161defae015b0d4039c542942b58ffd3acccd18 /src/sbin | |
| parent | c4528303121d1c33244d147e97c29669ac30c01b (diff) | |
| download | bcfg2-4568c44372c99ba809826e016680da9b881bd8e8.tar.gz bcfg2-4568c44372c99ba809826e016680da9b881bd8e8.tar.bz2 bcfg2-4568c44372c99ba809826e016680da9b881bd8e8.zip | |
Core: properly handle Ctrl-C
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-test | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test index f77e98269..8f9912139 100755 --- a/src/sbin/bcfg2-test +++ b/src/sbin/bcfg2-test @@ -5,7 +5,6 @@ without failures""" import os import sys -import signal import fnmatch import logging import Bcfg2.Logger @@ -73,19 +72,6 @@ class ClientTest(TestCase): id = __str__ -def get_sigint_handler(core): - """ Get a function that handles SIGINT/Ctrl-C by shutting down the - core and exiting properly.""" - - def hdlr(sig, frame): # pylint: disable=W0613 - """ Handle SIGINT/Ctrl-C by shutting down the core and exiting - properly. """ - core.shutdown() - os._exit(1) # pylint: disable=W0212 - - return hdlr - - def main(): optinfo = dict(noseopts=Bcfg2.Options.TEST_NOSEOPTS, test_ignore=Bcfg2.Options.TEST_IGNORE, @@ -113,7 +99,6 @@ def main(): setup['noseopts'].append("-v") core = Bcfg2.Server.Core.BaseCore(setup) - signal.signal(signal.SIGINT, get_sigint_handler(core)) ignore = dict() for entry in setup['test_ignore']: |