Commit 7d819751 authored by Nick Coghlan's avatar Nick Coghlan

Issue 10626 investigation: regrtest now checks for alterations to the logging...

Issue 10626 investigation: regrtest now checks for alterations to the logging state in the current process (and yes, test_pydoc alters it)
parent e5e728ba
...@@ -167,6 +167,7 @@ from inspect import isabstract ...@@ -167,6 +167,7 @@ from inspect import isabstract
import tempfile import tempfile
import platform import platform
import sysconfig import sysconfig
import logging
# Some times __path__ and __file__ are not absolute (e.g. while running from # Some times __path__ and __file__ are not absolute (e.g. while running from
...@@ -814,7 +815,7 @@ class saved_test_environment: ...@@ -814,7 +815,7 @@ class saved_test_environment:
resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr', resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr',
'os.environ', 'sys.path', 'sys.path_hooks', '__import__', 'os.environ', 'sys.path', 'sys.path_hooks', '__import__',
'warnings.filters', 'asyncore.socket_map') 'warnings.filters', 'asyncore.socket_map', 'logging._handlers')
def get_sys_argv(self): def get_sys_argv(self):
return id(sys.argv), sys.argv, sys.argv[:] return id(sys.argv), sys.argv, sys.argv[:]
...@@ -882,6 +883,15 @@ class saved_test_environment: ...@@ -882,6 +883,15 @@ class saved_test_environment:
asyncore.close_all(ignore_all=True) asyncore.close_all(ignore_all=True)
asyncore.socket_map.update(saved_map) asyncore.socket_map.update(saved_map)
def get_logging__handlers(self):
# _handlers is a WeakValueDictionary
# _handlerList is a list of weakrefs to handlers
return (id(logging._handlers), logging._handlers, logging._handlers.copy(),
id(logging._handlerList), logging._handlerList, logging._handlerList[:])
def restore_logging__handlers(self, saved_handlers):
# Can't easily revert the logging state
pass
def resource_info(self): def resource_info(self):
for name in self.resources: for name in self.resources:
method_suffix = name.replace('.', '_') method_suffix = name.replace('.', '_')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment