openstack/swift
Code Issues Proposed changes

Merge "Use /var/run/syslog on macosx for syslog tests."

Browse Source
This commit is contained in:
Jenkins
2013-08-08 00:27:26 +00:00
committed by Gerrit Code Review
parent aebb2582ae 64756f8d17
commit 3ceec7f90e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/unit/common/test_utils.py
View File

@@ -432,10 +432,16 @@ class TestUtils(unittest.TestCase):
utils.get_logger({
'log_facility': 'LOG_LOCAL3',
}, 'server', log_route='server')
self.assertEquals([
((), {'address': '/dev/log',
'facility': orig_sysloghandler.LOG_LOCAL3})],
syslog_handler_args)
expected_args = [((), {'address': '/dev/log',
'facility': orig_sysloghandler.LOG_LOCAL3})]
if not os.path.exists('/dev/log') or \
os.path.isfile('/dev/log') or \
os.path.isdir('/dev/log'):
# Since socket on OSX is in /var/run/syslog, there will be
# a fallback to UDP.
expected_args.append(((),
{'facility': orig_sysloghandler.LOG_LOCAL3}))
self.assertEquals(expected_args, syslog_handler_args)
syslog_handler_args = []
utils.get_logger({