Fix recently modified tx tests

Author: bagerard

mongoengine/queryset/base.py

@@ -282,7 +282,7 @@ def get(self, *q_objs, **query):
         except StopIteration:
             return result
 
-        # If we were able to retrieve the 2nd doc, raise the MultipleObjectsReturned exception.
+        # If we were able to retrieve a 2nd doc, raise the MultipleObjectsReturned exception.
         raise queryset._document.MultipleObjectsReturned(
             "2 or more items returned, instead of 1"
         )

tests/test_connection.py

@@ -633,22 +633,38 @@ def test_read_preference_from_parse(self):
         assert conn.read_preference == ReadPreference.SECONDARY_PREFERRED
 
     def test_multiple_connection_settings(self):
-        connect("mongoenginetest", alias="t1", host="localhost")
-
-        connect("mongoenginetest2", alias="t2", host="127.0.0.1")
+        connect(
+            "mongoenginetest",
+            alias="t1",
+            host="localhost",
+            read_preference=ReadPreference.PRIMARY,
+        )
+        connect(
+            "mongoenginetest2",
+            alias="t2",
+            host="127.0.0.1",
+            read_preference=ReadPreference.PRIMARY_PREFERRED,
+        )
 
         mongo_connections = mongoengine.connection._connections
         assert len(mongo_connections.items()) == 2
         assert "t1" in mongo_connections.keys()
         assert "t2" in mongo_connections.keys()
 
-        # Handle PyMongo 3+ Async Connection
+        # Handle PyMongo 3+ Async Connection (lazily established)
         # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
         # Purposely not catching exception to fail test if thrown.
         mongo_connections["t1"].server_info()
         mongo_connections["t2"].server_info()
+
         assert mongo_connections["t1"].address[0] == "localhost"
-        assert mongo_connections["t2"].address[0] == "127.0.0.1"
+        assert (
+            mongo_connections["t2"].address[0] == "localhost"
+        )  # weird but we have this with replicaset
+        assert mongo_connections["t1"].read_preference == ReadPreference.PRIMARY
+        assert (
+            mongo_connections["t2"].read_preference == ReadPreference.PRIMARY_PREFERRED
+        )
         assert mongo_connections["t1"] is not mongo_connections["t2"]
 
     def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):

tests/test_context_managers.py

@@ -550,7 +550,7 @@ class A(Document):
                 assert A.objects.get(id=a_doc.id).name == "b"
                 raise TestRollbackError()
 
-        assert A.objects.count() == 0
+        assert A.objects.count() == 1
         assert A.objects.get(id=a_doc.id).name == "a"
 
     @requires_mongodb_gte_40
@@ -793,7 +793,7 @@ def test_thread_safety_of_transactions(self):
         of value 0 - 9.
 
         We then spin up 10 threads and attempt to update a target
-        record by multiplying it's integer value by 10. Then, if
+        record by multiplying its integer value by 10. Then, if
         the target record is even, throw an exception, which
         should then roll the transaction back. The odd rows always
         succeed.
@@ -809,6 +809,7 @@ def test_thread_safety_of_transactions(self):
         class A(Document):
             i = IntField()
 
+        A.drop_collection()
         # Ensure the collection is created
         A.objects.create(i=0)