523bc0ab71
Previously, we would set the TZ environment variable to the result of time.strftime("%z", time.gmtime()) This has a few problems. 1. The "%z" format does not appear in the table of formatting directives for strftime [1]. While it *does* appear in a footnote [2] for that section, it is described as "not supported by all ANSI C libraries." This may explain the next point. 2. On the handful of Linux platforms I've tested, the above produces "+0000" regardless of the system's timezone. This seems to run counter to the intent of the patches that introduced the TZ mangling. (See the first two related changes.) 3. The above does not produce a valid Posix TZ format, which expects (at minimum) a name consisting of three or more alphabetic characters followed by the offset to be added to the local time to get Coordinated Universal Time (UTC). Further, while we would change os.environ['TZ'], we would *not* call time.tzset like it says in the docs [3], which seems like a Bad Thing. Some combination of the above has the net effect of changing some of the functions in the time module to use UTC. (Maybe all of them? At the very least, time.localtime and time.mktime.) However, it does *not* change the offset stored in time.timezone, which causes bad behavior when dealing with local timestamps [4]. Now, set TZ to "UTC+0" and call tzset. Apparently we don't have a good way of getting local timezone info, we were (unintentionally?) using UTC before, and you should probably be running your servers in UTC anyway. [1] https://docs.python.org/2/library/time.html#time.strftime [2] https://docs.python.org/2/library/time.html#id2 [3] https://docs.python.org/2/library/time.html#time.tzset [4] Like in email.utils.mktime_tz, prior to being fixed in https://hg.python.org/cpython/rev/a283563c8cc4 Change-Id: I007425301914144e228b9cfece5533443e851b6e Related-Change: Ifc78236a99ed193a42389e383d062b38f57a5a31 Related-Change: I8ec80202789707f723abfe93ccc9cf1e677e4dc6 Related-Change: Iee7488d03ab404072d3d0c1a262f004bb0f2da26
164 lines
5.6 KiB
Python
164 lines
5.6 KiB
Python
# Copyright (c) 2010-2012 OpenStack Foundation
|
|
#
|
|
# 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.
|
|
|
|
# TODO(clayg): Test kill_children signal handlers
|
|
|
|
import os
|
|
from six import StringIO
|
|
from six.moves import reload_module
|
|
import time
|
|
import unittest
|
|
from getpass import getuser
|
|
import logging
|
|
from test.unit import tmpfile
|
|
import mock
|
|
import signal
|
|
|
|
from swift.common import daemon, utils
|
|
|
|
|
|
class MyDaemon(daemon.Daemon):
|
|
|
|
def __init__(self, conf):
|
|
self.conf = conf
|
|
self.logger = utils.get_logger(None, 'server', log_route='server')
|
|
MyDaemon.forever_called = False
|
|
MyDaemon.once_called = False
|
|
|
|
def run_forever(self):
|
|
MyDaemon.forever_called = True
|
|
|
|
def run_once(self):
|
|
MyDaemon.once_called = True
|
|
|
|
def run_raise(self):
|
|
raise OSError
|
|
|
|
def run_quit(self):
|
|
raise KeyboardInterrupt
|
|
|
|
|
|
class TestDaemon(unittest.TestCase):
|
|
|
|
def test_create(self):
|
|
d = daemon.Daemon({})
|
|
self.assertEqual(d.conf, {})
|
|
self.assertTrue(isinstance(d.logger, utils.LogAdapter))
|
|
|
|
def test_stubs(self):
|
|
d = daemon.Daemon({})
|
|
self.assertRaises(NotImplementedError, d.run_once)
|
|
self.assertRaises(NotImplementedError, d.run_forever)
|
|
|
|
|
|
class TestRunDaemon(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
utils.HASH_PATH_SUFFIX = 'endcap'
|
|
utils.HASH_PATH_PREFIX = 'startcap'
|
|
utils.drop_privileges = lambda *args: None
|
|
utils.capture_stdio = lambda *args: None
|
|
|
|
def tearDown(self):
|
|
reload_module(utils)
|
|
|
|
def test_run(self):
|
|
d = MyDaemon({})
|
|
self.assertFalse(MyDaemon.forever_called)
|
|
self.assertFalse(MyDaemon.once_called)
|
|
# test default
|
|
d.run()
|
|
self.assertEqual(d.forever_called, True)
|
|
# test once
|
|
d.run(once=True)
|
|
self.assertEqual(d.once_called, True)
|
|
|
|
def test_signal(self):
|
|
d = MyDaemon({})
|
|
with mock.patch('swift.common.daemon.signal') as mock_signal:
|
|
mock_signal.SIGTERM = signal.SIGTERM
|
|
d.run()
|
|
signal_args, kwargs = mock_signal.signal.call_args
|
|
sig, func = signal_args
|
|
self.assertEqual(sig, signal.SIGTERM)
|
|
with mock.patch('swift.common.daemon.os') as mock_os:
|
|
func()
|
|
self.assertEqual(mock_os.method_calls, [
|
|
mock.call.killpg(0, signal.SIGTERM),
|
|
# hard exit because bare except handlers can trap SystemExit
|
|
mock.call._exit(0)
|
|
])
|
|
|
|
def test_run_daemon(self):
|
|
sample_conf = "[my-daemon]\nuser = %s\n" % getuser()
|
|
with tmpfile(sample_conf) as conf_file:
|
|
with mock.patch.dict('os.environ', {'TZ': ''}):
|
|
with mock.patch('time.tzset') as mock_tzset:
|
|
daemon.run_daemon(MyDaemon, conf_file)
|
|
self.assertTrue(MyDaemon.forever_called)
|
|
self.assertEqual(os.environ['TZ'], 'UTC+0')
|
|
self.assertEqual(mock_tzset.mock_calls, [mock.call()])
|
|
daemon.run_daemon(MyDaemon, conf_file, once=True)
|
|
self.assertEqual(MyDaemon.once_called, True)
|
|
|
|
# test raise in daemon code
|
|
with mock.patch.object(MyDaemon, 'run_once', MyDaemon.run_raise):
|
|
self.assertRaises(OSError, daemon.run_daemon, MyDaemon,
|
|
conf_file, once=True)
|
|
|
|
# test user quit
|
|
sio = StringIO()
|
|
logger = logging.getLogger('server')
|
|
logger.addHandler(logging.StreamHandler(sio))
|
|
logger = utils.get_logger(None, 'server', log_route='server')
|
|
with mock.patch.object(MyDaemon, 'run_forever', MyDaemon.run_quit):
|
|
daemon.run_daemon(MyDaemon, conf_file, logger=logger)
|
|
self.assertTrue('user quit' in sio.getvalue().lower())
|
|
|
|
# test missing section
|
|
sample_conf = "[default]\nuser = %s\n" % getuser()
|
|
with tmpfile(sample_conf) as conf_file:
|
|
self.assertRaisesRegexp(SystemExit,
|
|
'Unable to find my-daemon '
|
|
'config section in.*',
|
|
daemon.run_daemon, MyDaemon,
|
|
conf_file, once=True)
|
|
|
|
def test_run_daemon_diff_tz(self):
|
|
old_tz = os.environ.get('TZ', '')
|
|
try:
|
|
os.environ['TZ'] = 'EST+05EDT,M4.1.0,M10.5.0'
|
|
time.tzset()
|
|
self.assertEqual((1970, 1, 1, 0, 0, 0), time.gmtime(0)[:6])
|
|
self.assertEqual((1969, 12, 31, 19, 0, 0), time.localtime(0)[:6])
|
|
self.assertEqual(18000, time.timezone)
|
|
|
|
sample_conf = "[my-daemon]\nuser = %s\n" % getuser()
|
|
with tmpfile(sample_conf) as conf_file:
|
|
daemon.run_daemon(MyDaemon, conf_file)
|
|
self.assertFalse(MyDaemon.once_called)
|
|
self.assertTrue(MyDaemon.forever_called)
|
|
|
|
self.assertEqual((1970, 1, 1, 0, 0, 0), time.gmtime(0)[:6])
|
|
self.assertEqual((1970, 1, 1, 0, 0, 0), time.localtime(0)[:6])
|
|
self.assertEqual(0, time.timezone)
|
|
finally:
|
|
os.environ['TZ'] = old_tz
|
|
time.tzset()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|