Fix failing tests and add some default connection parameters.

Author: r4fek

django_mongodb_engine/base.py

@@ -213,7 +213,7 @@ def pop(name, default=None):
 
         db_name = pop('NAME')
         host = pop('HOST')
-        port = int(pop('PORT', 27017))
+        port = pop('PORT', 27017)
         user = pop('USER')
         password = pop('PASSWORD')
         options = pop('OPTIONS', {})
@@ -238,15 +238,27 @@ def pop(name, default=None):
             if read_preference:
                 options['read_preference'] = ReadPreference.SECONDARY
                 warnings.warn("slave_okay has been deprecated. "
-                        "Please use read_preference instead.")
+                              "Please use read_preference instead.")
 
         if replicaset:
-            connection = MongoReplicaSetClient
+            connection_class = MongoReplicaSetClient
         else:
-            connection = MongoClient
+            connection_class = MongoClient
+
+        conn_options = dict(
+            host=host,
+            port=int(port),
+            max_pool_size=None,
+            document_class=dict,
+            tz_aware=False,
+            _connect=True,
+            auto_start_request=True,
+            safe=False
+        )
+        conn_options.update(options)
 
         try:
-            self.connection = connection(host=host, port=port, **options)
+            self.connection = connection_class(**conn_options)
             self.database = self.connection[db_name]
         except TypeError:
             exc_info = sys.exc_info()

tests/mongodb/tests.py

@@ -55,7 +55,7 @@ def test_generic_field(self):
             self.assertEqual(RawModel.objects.get(id=id).raw, obj)
 
     def test_databasewrapper_api(self):
-        from pymongo.connection import Connection
+        from pymongo.mongo_client import MongoClient
         from pymongo.database import Database
         from pymongo.collection import Collection
         from random import shuffle
@@ -70,7 +70,7 @@ def test_databasewrapper_api(self):
                 lambda: self.assertIsInstance(wrapper.get_collection('foo'),
                                               Collection),
                 lambda: self.assertIsInstance(wrapper.database, Database),
-                lambda: self.assertIsInstance(wrapper.connection, Connection),
+                lambda: self.assertIsInstance(wrapper.connection, MongoClient),
             ]
             shuffle(calls)
             for call in calls: