[Python-checkins] cpython (merge 3.5 -> default): Fixes #25097: Merged fix from 3.5.

Thu Oct 1 15:39:52 EDT 2015

https://hg.python.org/cpython/rev/757baaedc043
changeset: 98467:757baaedc043
parent: 98464:10efb1797e7b
parent: 98466:b54528d8d8c3
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Thu Oct 01 20:39:30 2015 +0100
summary:
 Fixes #25097: Merged fix from 3.5.
files:
 Lib/test/test_logging.py | 20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -58,14 +58,10 @@
 except ImportError:
 threading = None
 try:
- import win32evtlog
+ import win32evtlog, win32evtlogutil, pywintypes
 except ImportError:
- win32evtlog = None
-try:
- import win32evtlogutil
-except ImportError:
- win32evtlogutil = None
- win32evtlog = None
+ win32evtlog = win32evtlogutil = pywintypes = None
+
 try:
 import zlib
 except ImportError:
@@ -4128,13 +4124,19 @@
 setattr(TimedRotatingFileHandlerTest, "test_compute_rollover_%s" % when, test_compute_rollover)
 
 
- at unittest.skipUnless(win32evtlog, 'win32evtlog/win32evtlogutil required for this test.')
+ at unittest.skipUnless(win32evtlog, 'win32evtlog/win32evtlogutil/pywintypes required for this test.')
 class NTEventLogHandlerTest(BaseTest):
 def test_basic(self):
 logtype = 'Application'
 elh = win32evtlog.OpenEventLog(None, logtype)
 num_recs = win32evtlog.GetNumberOfEventLogRecords(elh)
- h = logging.handlers.NTEventLogHandler('test_logging')
+
+ try:
+ h = logging.handlers.NTEventLogHandler('test_logging')
+ except pywintypes.error as e:
+ if e[0] == 5: # access denied
+ raise unittest.SkipTest('Insufficient privileges to run test')
+
 r = logging.makeLogRecord({'msg': 'Test Log Message'})
 h.handle(r)
 h.close()
-- 
Repository URL: https://hg.python.org/cpython
