Permalink
Browse files

run python 3.5 on travis, adopt timeouts

Also
- Report the five slowest tests to watch for risk of timeout
- Double timeouts.
  Maybe that helps pypy on travis to finish successfully.
  • Loading branch information...
1 parent df22f12 commit 8e99706b16041c8805c70f7e3b67604447d2770e @kampfschlaefer kampfschlaefer committed Feb 27, 2016
Showing with 8 additions and 6 deletions.
  1. +1 −1 .travis.yml
  2. +6 −4 tests/test_worker.py
  3. +1 −1 tox.ini
View
@@ -16,6 +16,6 @@ install:
- pip install coveralls
#- pip install pytest # installed by Travis by default already
script:
- - RUN_SLOW_TESTS_TOO=1 py.test --cov rq
+ - RUN_SLOW_TESTS_TOO=1 py.test --cov rq --durations=5
after_success:
- coveralls
View
@@ -578,13 +578,15 @@ def kill_worker(pid, double_kill):
class TestWorkerShutdown(RQTestCase):
def setUp(self):
# we want tests to fail if signal are ignored and the work remain
- # running, so set a signal to kill them after 5 seconds
+ # running, so set a signal to kill them after X seconds
+ self.killtimeout = 10
signal.signal(signal.SIGALRM, self._timeout)
- signal.alarm(5)
+ signal.alarm(self.killtimeout)
def _timeout(self, signal, frame):
- raise AssertionError("test still running after 5 seconds, "
- "likely the worker wasn't shutdown correctly")
+ raise AssertionError(
+ "test still running after %i seconds, likely the worker wasn't shutdown correctly" % self.killtimeout
+ )
@slow
def test_idle_worker_warm_shutdown(self):
View
@@ -2,7 +2,7 @@
envlist=py26,py27,py33,py34,py35,pypy,flake8
[testenv]
-commands=py.test --cov rq {posargs}
+commands=py.test --cov rq --durations=5 {posargs}
deps=
pytest
pytest-cov

0 comments on commit 8e99706

Please sign in to comment.