Fixes tests

dmtaub · Jul 1, 2012 · f5dc696 · f5dc696
1 parent 38ee481
commit f5dc696
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/celery/tests/bin/test_celery.py b/celery/tests/bin/test_celery.py
@@ -12,7 +12,7 @@
     Error,
     worker,
     list_,
-    apply,
+    call,
     purge,
     result,
     inspect,
@@ -125,11 +125,11 @@ def test_run(self):
             l.run('foo')
 
 
-class test_apply(AppCase):
+class test_call(AppCase):
 
     @patch('celery.app.base.Celery.send_task')
     def test_run(self, send_task):
-        a = apply(app=self.app, stderr=WhateverIO(), stdout=WhateverIO())
+        a = call(app=self.app, stderr=WhateverIO(), stdout=WhateverIO())
         a.run('tasks.add')
         self.assertTrue(send_task.called)
 

diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,6 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
                 -r{toxinidir}/requirements/test-py3k.txt
-           pip install http://github.com/celery/kombu/zipball/master
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py33]
@@ -29,16 +28,13 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
                 -r{toxinidir}/requirements/test-py3k.txt
-
-           pip install http://github.com/celery/kombu/zipball/master
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install http://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \
@@ -51,7 +47,6 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py26.txt
        -r{toxinidir}/requirements/test.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install http://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \