Merge pull request #4 from HiredScore/DEV-23298-upgrade-pymongo

Fix pymongo compatability

Author: shai-katzir-hs

celery/__init__.py

@@ -20,7 +20,7 @@
 
 SERIES = 'cliffs'
 
-__version__ = '4.5.0'
+__version__ = '4.5.0.1'
 __author__ = 'Ask Solem'
 __contact__ = '[email protected]'
 __homepage__ = 'http://celeryproject.org'

celery/backends/mongodb.py

@@ -274,16 +274,7 @@ def __reduce__(self, args=(), kwargs=None):
 
     def _get_database(self):
         conn = self._get_connection()
-        db = conn[self.database_name]
-        if self.user and self.password:
-            source = self.options.get(
-                'authsource',
-                self.database_name or 'admin'
-            )
-            if not db.authenticate(self.user, self.password, source=source):
-                raise ImproperlyConfigured(
-                    'Invalid MongoDB username or password.')
-        return db
+        return conn[self.database_name]
 
     @cached_property
     def database(self):

requirements/extras/mongodb.txt

@@ -1 +1 @@
-pymongo[srv]>=3.3.0
+pymongo[srv]>=3.11.1

t/unit/backends/test_mongodb.py

@@ -277,8 +277,6 @@ def test_get_database_no_existing(self, mock_get_connection):
 
         assert database is mock_database
         assert self.backend.__dict__['database'] is mock_database
-        mock_database.authenticate.assert_called_once_with(
-            MONGODB_USER, MONGODB_PASSWORD, source=self.backend.database_name)
 
     @patch('celery.backends.mongodb.MongoBackend._get_connection')
     def test_get_database_no_existing_no_auth(self, mock_get_connection):
@@ -294,7 +292,6 @@ def test_get_database_no_existing_no_auth(self, mock_get_connection):
         database = self.backend.database
 
         assert database is mock_database
-        mock_database.authenticate.assert_not_called()
         assert self.backend.__dict__['database'] is mock_database
 
     @patch('celery.backends.mongodb.MongoBackend._get_database')
@@ -487,18 +484,6 @@ def test_cleanup(self, mock_get_database):
         mock_get_database.assert_called_once_with()
         mock_collection.delete_many.assert_called()
 
-    def test_get_database_authfailure(self):
-        x = MongoBackend(app=self.app)
-        x._get_connection = Mock()
-        conn = x._get_connection.return_value = {}
-        db = conn[x.database_name] = Mock()
-        db.authenticate.return_value = False
-        x.user = 'jerry'
-        x.password = 'cere4l'
-        with pytest.raises(ImproperlyConfigured):
-            x._get_database()
-        db.authenticate.assert_called_with('jerry', 'cere4l',
-                                           source=x.database_name)
 
     def test_prepare_client_options(self):
         with patch('pymongo.version_tuple', new=(3, 0, 3)):