add test for threadsafe_call exception and allow logging in tests

Author: bfredl

neovim/__init__.py

@@ -16,7 +16,7 @@
 __all__ = ('tcp_session', 'socket_session', 'stdio_session', 'child_session',
            'start_host', 'autocmd', 'command', 'encoding', 'function',
            'plugin', 'rpc_export', 'Host', 'DecodeHook', 'Nvim',
-           'SessionHook', 'shutdown_hook', 'attach')
+           'SessionHook', 'shutdown_hook', 'attach', 'setup_logging')
 
 
 def start_host(session=None):
@@ -43,23 +43,8 @@ def start_host(session=None):
     if not plugins:
         sys.exit('must specify at least one plugin as argument')
 
-    logger = logging.getLogger(__name__)
-    if 'NVIM_PYTHON_LOG_FILE' in os.environ:
-        logfile = (os.environ['NVIM_PYTHON_LOG_FILE'].strip() +
-                   '_' + str(os.getpid()))
-        handler = logging.FileHandler(logfile, 'w')
-        handler.formatter = logging.Formatter(
-            '%(asctime)s [%(levelname)s @ '
-            '%(filename)s:%(funcName)s:%(lineno)s] %(process)s - %(message)s')
-        logging.root.addHandler(handler)
-        level = logging.INFO
-        if 'NVIM_PYTHON_LOG_LEVEL' in os.environ:
-            l = getattr(logging,
-                        os.environ['NVIM_PYTHON_LOG_LEVEL'].strip(),
-                        level)
-            if isinstance(l, int):
-                level = l
-        logger.setLevel(level)
+    setup_logging()
+
     if not session:
         session = stdio_session()
     host = Host(Nvim.from_session(session))
@@ -95,6 +80,27 @@ def attach(session_type, address=None, port=None, path=None, argv=None):
     return Nvim.from_session(session)
 
 
+def setup_logging():
+    """Setup logging according to environment variables."""
+    logger = logging.getLogger(__name__)
+    if 'NVIM_PYTHON_LOG_FILE' in os.environ:
+        logfile = (os.environ['NVIM_PYTHON_LOG_FILE'].strip() +
+                   '_' + str(os.getpid()))
+        handler = logging.FileHandler(logfile, 'w')
+        handler.formatter = logging.Formatter(
+            '%(asctime)s [%(levelname)s @ '
+            '%(filename)s:%(funcName)s:%(lineno)s] %(process)s - %(message)s')
+        logging.root.addHandler(handler)
+        level = logging.INFO
+        if 'NVIM_PYTHON_LOG_LEVEL' in os.environ:
+            l = getattr(logging,
+                        os.environ['NVIM_PYTHON_LOG_LEVEL'].strip(),
+                        level)
+            if isinstance(l, int):
+                level = l
+        logger.setLevel(level)
+
+
 # Required for python 2.6
 class NullHandler(logging.Handler):
     def emit(self, record):

test/test_common.py

@@ -6,6 +6,7 @@
 
 from nose.tools import eq_ as eq
 
+neovim.setup_logging()
 
 if 'NVIM_CHILD_ARGV' in os.environ:
     vim = neovim.attach('child', argv=json.loads(os.environ['NVIM_CHILD_ARGV']))
@@ -17,7 +18,6 @@
     # with Python2
     vim = vim.with_hook(neovim.DecodeHook())
 
-
 cleanup_func = ''':function BeforeEachTest()
   set all&
   redir => groups

test/test_concurrency.py

@@ -9,3 +9,11 @@ def test_interrupt_from_another_thread():
     timer = Timer(0.5, lambda: session.threadsafe_call(lambda: session.stop()))
     timer.start()
     eq(vim.session.next_message(), None)
+
+
+@with_setup(setup=cleanup)
+def test_exception_in_threadsafe_call():
+    # an exception in a threadsafe_call shouldn't crash the entire host
+    vim.session.threadsafe_call(lambda: [vim.eval("3"), undefined_variable])
+    vim.session.threadsafe_call(lambda: vim.session.stop())
+    vim.session.run(None, None)