소스 검색

Fixes tests

Ask Solem 11 년 전
부모
커밋
3f3ffc318c
1개의 변경된 파일17개의 추가작업 그리고 5개의 파일을 삭제
  1. 17 5
      celery/tests/bin/test_worker.py

+ 17 - 5
celery/tests/bin/test_worker.py

@@ -280,15 +280,27 @@ class test_Worker(WorkerAppCase):
         def getuid():
             return 0
 
-        prev, os.getuid = os.getuid, getuid
-        try:
+        with patch('os.getuid') as getuid:
+            getuid.return_value = 0
+            self.app.conf.CELERY_ACCEPT_CONTENT = ['pickle']
+            with self.assertRaises(RuntimeError):
+                worker = self.Worker(app=self.app)
+                worker.on_start()
+            cd.C_FORCE_ROOT = True
+            try:
+                with self.assertWarnsRegex(
+                        RuntimeWarning,
+                        r'absolutely not recommended'):
+                    worker = self.Worker(app=self.app)
+                    worker.on_start()
+            finally:
+                cd.C_FORCE_ROOT = False
+            self.app.conf.CELERY_ACCEPT_CONTENT = ['json']
             with self.assertWarnsRegex(
                     RuntimeWarning,
-                    r'superuser privileges is discouraged'):
+                    r'absolutely not recommended'):
                 worker = self.Worker(app=self.app)
                 worker.on_start()
-        finally:
-            os.getuid = prev
 
     @disable_stdouts
     def test_redirect_stdouts(self):