8000 [3.11] Add more syslog tests (GH-97953). (GH-98096) · python/cpython@f6e50b8 · GitHub
[go: up one dir, main page]
Skip to content

Commit f6e50b8

Browse files
serhiy-storchakaserhiy-storchaka
authored
[3.11] Add more syslog tests (GH-97953). (GH-98096)
(cherry picked from commit cae7d1d)
1 parent bdc1087 commit f6e50b8

File tree

4 files changed

+97
-7
lines changed

4 files changed

+97
-7
lines changed

‎Lib/test/audit-tests.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,27 @@ def hook(event, args):
419419
sys._getframe()
420420

421421

422+
def test_syslog():
423+
import syslog
424+
425+
def hook(event, args):
426+
if event.startswith("syslog."):
427+
print(event, *args)
428+
429+
sys.addaudithook(hook)
430+
syslog.openlog('python')
431+
syslog.syslog('test')
432+
syslog.setlogmask(syslog.LOG_DEBUG)
433+
syslog.closelog()
434+
# implicit open
435+
syslog.syslog('test2')
436+
# open with default ident
437+
syslog.openlog(logoption=syslog.LOG_NDELAY, facility=syslog.LOG_LOCAL0)
438+
sys.argv = None
439+
syslog.openlog()
440+
syslog.closelog()
441+
442+
422443
if __name__ == "__main__":
423444
from test.support import suppress_msvcrt_asserts
424445

‎Lib/test/test_audit.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717

1818
class AuditTest(unittest.TestCase):
19+
maxDiff = None
1920

2021
@support.requires_subprocess()
2122
def do_test(self, *args):
@@ -185,5 +186,29 @@ def test_sys_getframe(self):
185186

186187
self.assertEqual(actual, expected)
187188

189+
def test_syslog(self):
190+
syslog = import_helper.import_module("syslog")
191+
192+
returncode, events, stderr = self.run_python("test_syslog")
193+
if returncode:
194+
self.fail(stderr)
195+
196+
if support.verbose:
197+
print('Events:', *events, sep='\n ')
198+
199+
self.assertSequenceEqual(
200+
events,
201+
[('syslog.openlog', ' ', f'python 0 {syslog.LOG_USER}'),
202+
('syslog.syslog', ' ', f'{syslog.LOG_INFO} test'),
203+
('syslog.setlogmask', ' ', f'{syslog.LOG_DEBUG}'),
204+
('syslog.closelog', '', ''),
205+
('syslog.syslog', ' ', f'{syslog.LOG_INFO} test2'),
206+
('syslog.openlog', ' ', f'audit-tests.py 0 {syslog.LOG_USER}'),
207+
('syslog.openlog', ' ', f'audit-tests.py {syslog.LOG_NDELAY} {syslog.LOG_LOCAL0}'),
208+
('syslog.openlog', ' ', f'None 0 {syslog.LOG_USER}'),
209+
('syslog.closelog', '', '')]
210+
)
211+
212+
188213
if __name__ == "__main__":
189214
unittest.main()

‎Lib/test/test_syslog.py

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
from test.support import import_helper
1+
from test.support import import_helper, threading_helper
22
syslog = import_helper.import_module("syslog") #skip if not supported
3+
from test import support
4+
import sys
5+
import threading
6+
import time
37
import unittest
48

59
# XXX(nnorwitz): This test sucks. I don't know of a platform independent way
@@ -8,6 +12,9 @@
812

913
class Test(unittest.TestCase):
1014

15+
def tearDown(self):
16+
syslog.closelog()
17+
1118
def test_openlog(self):
1219
syslog.openlog('python')
1320
# Issue #6697.
@@ -18,22 +25,59 @@ def test_syslog(self):
1825
syslog.syslog('test message from python test_syslog')
1926
syslog.syslog(syslog.LOG_ERR, 'test error from python test_syslog')
2027

28+
def test_syslog_implicit_open(self):
29+
syslog.closelog() # Make sure log is closed
30+
syslog.syslog('test message from python test_syslog')
31+
syslog.syslog(syslog.LOG_ERR, 'test error from python test_syslog')
32+
2133
def test_closelog(self):
2234
syslog.openlog('python')
2335
syslog.closelog()
36+
syslog.closelog() # idempotent operation
2437

2538
def test_setlogmask(self):
26-
syslog.setlogmask(syslog.LOG_DEBUG)
39+
mask = syslog.LOG_UPTO(syslog.LOG_WARNING)
40+
oldmask = syslog.setlogmask(mask)
41+
self.assertEqual(syslog.setlogmask(0), mask)
42+
self.assertEqual(syslog.setlogmask(oldmask), mask)
2743

2844
def test_log_mask(self):
29-
syslog.LOG_MASK(syslog.LOG_INFO)
30-
31-
def test_log_upto(self):
32-
syslog.LOG_UPTO(syslog.LOG_INFO)
45+
mask = syslog.LOG_UPTO(syslog.LOG_WARNING)
46+
self.assertTrue(mask & syslog.LOG_MASK(syslog.LOG_WARNING))
47+
self.assertTrue(mask & syslog.LOG_MASK(syslog.LOG_ERR))
48+
self.assertFalse(mask & syslog.LOG_MASK(syslog.LOG_INFO))
3349

3450
def test_openlog_noargs(self):
3551
syslog.openlog()
3652
syslog.syslog('test message from python test_syslog')
3753

54+
@threading_helper.requires_working_threading()
55+
def test_syslog_threaded(self):
56+
start = threading.Event()
57+
stop = False
58+
def opener():
59+
start.wait(10)
60+
i = 1
61+
while not stop:
62+
syslog.openlog(f'python-test-{i}') # new string object
63+
i += 1
64+
def logger():
65+
start.wait(10)
66+
while not stop:
67+
syslog.syslog('test message from python test_syslog')
68+
69+
orig_si = sys.getswitchinterval()
70+
support.setswitchinterval(1e-9)
71+
try:
72+
threads = [threading.Thread(target=opener)]
73+
threads += [threading.Thread(target=logger) for k in range(10)]
74+
with threading_helper.start_threads(threads):
75+
start.set()
76+
time.sleep(0.1)
77+
stop = True
78+
finally:
79+
sys.setswitchinterval(orig_si)
80+
81+
3882
if __name__ == "__main__":
3983
unittest.main()

‎Modules/syslogmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ syslog_setlogmask(PyObject *self, PyObject *args)
235235

236236
if (!PyArg_ParseTuple(args, "l;mask for priority", &maskpri))
237237
return NULL;
238-
if (PySys_Audit("syslog.setlogmask", "(O)", args ? args : Py_None) < 0) {
238+
if (PySys_Audit("syslog.setlogmask", "l", maskpri) < 0) {
239239
return NULL;
240240
}
241241
omaskpri = setlogmask(maskpri);

0 commit comments

Comments
 (0)
0