Browse Source

Attempts to fix Windows CI

Ask Solem 9 năm trước cách đây
mục cha
commit
dc9db5ff5a

+ 9 - 0
celery/tests/backends/test_database.py

@@ -22,6 +22,7 @@ try:
     import sqlalchemy  # noqa
 except ImportError:
     DatabaseBackend = Task = TaskSet = retry = None  # noqa
+    SessionManager = session_cleanup = None  # noqa
 else:
     from celery.backends.database import (
         DatabaseBackend, retry, session_cleanup,
@@ -39,6 +40,10 @@ class SomeClass(object):
 
 class test_session_cleanup(AppCase):
 
+    def setup(self):
+        if session_cleanup is None:
+            raise SkipTest('slqlalchemy not installed')
+
     def test_context(self):
         session = Mock(name='session')
         with session_cleanup(session):
@@ -215,6 +220,10 @@ class test_DatabaseBackend(AppCase):
 
 class test_SessionManager(AppCase):
 
+    def setup(self):
+        if SessionManager is None:
+            raise SkipTest('sqlalchemy not installed')
+
     def test_after_fork(self):
         s = SessionManager()
         self.assertFalse(s.forked)

+ 4 - 1
celery/tests/backends/test_filesystem.py

@@ -3,6 +3,7 @@ from __future__ import absolute_import
 
 import os
 import shutil
+import sys
 import tempfile
 
 from celery import states
@@ -10,12 +11,14 @@ from celery.backends.filesystem import FilesystemBackend
 from celery.exceptions import ImproperlyConfigured
 from celery.utils import uuid
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, SkipTest
 
 
 class test_FilesystemBackend(AppCase):
 
     def setup(self):
+        if sys.platform == 'win32':
+            raise SkiptTest('win32: skip')
         self.directory = tempfile.mkdtemp()
         self.url = 'file://' + self.directory
         self.path = self.directory.encode('ascii')

+ 4 - 0
celery/tests/utils/test_platforms.py

@@ -61,6 +61,10 @@ class test_find_option_with_arg(Case):
 
 class test_fd_by_path(Case):
 
+    def setUp(self):
+        if sys.platform == 'win32':
+            raise SkipTest('win32: skip')
+
     def test_finds(self):
         test_file = tempfile.NamedTemporaryFile()
         try:

+ 2 - 2
celery/tests/worker/test_request.py

@@ -696,7 +696,7 @@ class test_Request(RequestCase):
                 message.content_type, message.content_encoding)
             self.assertFalse(failed)
             self.assertEqual(res, repr(4 ** 4))
-            self.assertTrue(runtime)
+            self.assertIsNotNone(runtime)
             self.assertIsInstance(runtime, numbers.Real)
         finally:
             reset_worker_optimizations()
@@ -708,7 +708,7 @@ class test_Request(RequestCase):
         )
         self.assertFalse(failed)
         self.assertEqual(res, repr(4 ** 4))
-        self.assertTrue(runtime)
+        self.assertIsNotNone(runtime)
         self.assertIsInstance(runtime, numbers.Real)
 
     def test_trace_task_ret(self):