Merge pull request #347 from blueyed/fix-tests

Fix tests on Travis

Author: bfredl

.travis.yml

@@ -6,6 +6,7 @@ env:
     - NOSE_VERBOSE=2
     - NOSE_WITH_COVERAGE=true
     - NOSE_COVER_PACKAGE=neovim
+    - PYTEST_ADDOPTS=-vv
   matrix:
     - CI_TARGET=tests
 matrix:

setup.cfg

@@ -1,2 +1,6 @@
 [flake8]
 ignore = D211,E731,D401
+
+[tool:pytest]
+testpaths = test
+timeout = 10

test/test_client_rpc.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import time
 
 
 def test_call_and_reply(vim):
@@ -41,6 +42,11 @@ def request_cb(name, args):
     # this would have dead-locked if not async
     vim.funcs.rpcrequest(vim.channel_id, "test-event", async_=True)
     vim.run_loop(request_cb, None, None)
+
+    # TODO(blueyed): This sleep is required on Travis, where it hangs with
+    # "Entering event loop" otherwise  (asyncio's EpollSelector._epoll.poll).
+    time.sleep(0.1)
+
     assert vim.vars['result'] == 17
 
 

tox.ini

@@ -4,11 +4,13 @@ envlist =
   py36-docs
 
 [testenv]
-deps=
+deps =
   pytest
   pytest-xdist
+  pytest-timeout
   pyuv: pyuv
-commands=python -m pytest -s
+passenv = PYTEST_ADDOPTS
+commands = python -m pytest {posargs}
 
 [testenv:checkqa]
 deps =