Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Come on Travis

  • Loading branch information...
commit e261f26b998fd121a0e133c1761c1a46f0f7402b 1 parent 0636d2a
@ask authored
View
6 .travis.yml
@@ -2,8 +2,10 @@ language: python
python:
- 2.6
- 2.7
-install: pip install --use-mirrors tox
-script: contrib/release/travistest
+install:
+ - pip install --use-mirrors tox
+ - pip install -U kombu
+script: TOXENV=py$(echo $TRAVIS_PYTHON_VERSION | tr -d .) tox
notifications:
irc:
channels: "irc.freenode.org#celery"
View
6 celery/tests/test_worker/__init__.py
@@ -554,14 +554,14 @@ def test_receieve_message_ack_raises(self):
l.event_dispatcher = Mock()
l.connection_errors = (socket.error, )
l.logger = Mock()
- m.ack = Mock()
- m.ack.side_effect = socket.error("foo")
+ m.reject = Mock()
+ m.reject.side_effect = socket.error("foo")
with self.assertWarnsRegex(RuntimeWarning, r'unknown message'):
self.assertFalse(l.receive_message(m.decode(), m))
with self.assertRaises(Empty):
self.ready_queue.get_nowait()
self.assertTrue(self.eta_schedule.empty())
- m.ack.assert_called_with()
+ m.reject.assert_called_with()
self.assertTrue(l.logger.critical.call_count)
def test_receieve_message_eta(self):
View
4 contrib/release/travistest
@@ -1,4 +0,0 @@
-#!/bin/bash
-#--
-export TOXENV="py$(echo $TRAVIS_PYTHON_VERSION | sed 's/\.//g')"
-tox
View
4 tox.ini
@@ -36,8 +36,8 @@ deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/py26.txt
-r{toxinidir}/requirements/test.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
- pip -E {envdir} install -r contrib/requirements/py26.txt
- pip -E {envdir} install -r contrib/requirements/test.txt
+ pip install -r contrib/requirements/py26.txt
+ pip install -r contrib/requirements/test.txt
nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \
Please sign in to comment.
Something went wrong with that request. Please try again.