Browse Source

Tests passing

Ask Solem 13 years ago
parent
commit
20be2ef744

+ 1 - 9
celery/tests/test_bin/test_celeryd.py

@@ -13,15 +13,13 @@ except ImportError:
 
 from mock import patch
 from nose import SkipTest
-from kombu.tests.utils import redirect_stdouts
 
 from celery import Celery
 from celery import platforms
 from celery import signals
 from celery import current_app
 from celery.apps import worker as cd
-from celery.bin.celeryd import WorkerCommand, windows_main, \
-                               main as celeryd_main
+from celery.bin.celeryd import WorkerCommand, main as celeryd_main
 from celery.exceptions import ImproperlyConfigured
 
 from celery.tests.utils import (AppCase, WhateverIO, mask_modules,
@@ -380,12 +378,6 @@ class test_Worker(AppCase):
 
 class test_funs(AppCase):
 
-    @redirect_stdouts
-    def test_windows_main(self, stdout, stderr):
-        windows_main()
-        self.assertIn("celeryd command does not work on Windows",
-                      stderr.getvalue())
-
     @disable_stdouts
     def test_set_process_status(self):
         try:

+ 5 - 1
celery/tests/test_worker/__init__.py

@@ -14,7 +14,9 @@ from mock import Mock, patch
 from nose import SkipTest
 
 from celery import current_app
+from celery.app.defaults import DEFAULTS
 from celery.concurrency.base import BasePool
+from celery.datastructures import AttributeDict
 from celery.exceptions import SystemTerminate
 from celery.task import task as task_dec
 from celery.task import periodic_task as periodic_task_dec
@@ -750,7 +752,9 @@ class test_WorkController(AppCase):
         on_worker_process_init.called = False
         signals.worker_process_init.connect(on_worker_process_init)
 
-        app = Celery(loader=Mock(), set_as_current=False)
+        loader = Mock()
+        app = Celery(loader=loader, set_as_current=False)
+        app.conf = AttributeDict(DEFAULTS)
         process_initializer(app, "awesome.worker.com")
         self.assertIn((tuple(WORKER_SIGIGNORE), {}),
                       _signals.ignore.call_args_list)

+ 2 - 0
contrib/release/doc4allmods

@@ -5,6 +5,8 @@ SKIP_PACKAGES="$PACKAGE tests management urls"
 SKIP_FILES="celery.backends.pyredis.rst
             celery.bin.rst
             celery.bin.celeryd_detach.rst
+            celery.concurrency.processes.forking.rst
+            celery.concurrency.processes.process.rst
             celery.concurrency.processes._win.rst
             celery.contrib.rst
             celery.contrib.bundles.rst

+ 12 - 0
docs/reference/celery.contrib.migrate.rst

@@ -0,0 +1,12 @@
+========================
+ celery.contrib.migrate
+========================
+
+.. contents::
+    :local:
+
+.. currentmodule:: celery.contrib.migrate
+
+.. automodule:: celery.contrib.migrate
+    :members:
+    :undoc-members:

+ 1 - 0
docs/reference/index.rst

@@ -33,6 +33,7 @@
     celery.states
     celery.contrib.abortable
     celery.contrib.batches
+    celery.contrib.migrate
     celery.contrib.rdb
     celery.events
     celery.events.state