more mypy validation fixes

Author: vipbhardwaj

tests/QE/test_delta_sync.py

@@ -448,6 +448,7 @@ async def test_delta_sync_utf8_strings(
         sgw_doc = await cblpytest.sync_gateways[0].get_document(
             "travel", "hotel_1", "travel", "hotels"
         )
+        assert sgw_doc is not None, "Document should exist in SGW"
         self.mark_test_step("Update docs in SGW/CBL with utf8 strings")
         updates = [
             DocumentUpdateEntry(
@@ -605,6 +606,7 @@ async def test_delta_sync_enabled_disabled(
         sgw_doc = await cblpytest.sync_gateways[0].get_document(
             "travel", "hotel_1", "travel", "hotels"
         )
+        assert sgw_doc is not None, "Document should exist in SGW"
         await cblpytest.sync_gateways[0].upsert_documents(
             "travel",
             [
@@ -734,6 +736,7 @@ async def test_delta_sync_enabled_disabled(
         sgw_doc = await cblpytest.sync_gateways[0].get_document(
             "posts", "post_1", collection="posts"
         )
+        assert sgw_doc is not None, "Document should exist in SGW"
         await cblpytest.sync_gateways[0].upsert_documents(
             "posts",
             [
@@ -1114,6 +1117,7 @@ async def test_delta_sync_larger_than_doc(
         doc = await cblpytest.sync_gateways[0].get_document(
             "travel", "hotel_1", "travel", "hotels"
         )
+        assert doc is not None, "Document should exist in SGW"
         current_rev = doc.revid
         large_doc_body = "X" * 2_000_000
         await cblpytest.sync_gateways[0].update_documents(

tests/QE/test_no_conflicts.py

@@ -305,15 +305,12 @@ async def test_multiple_cbls_updates_concurrently_with_push(
         sg_doc = await cblpytest.sync_gateways[0].get_document(
             "posts", "post_1000", collection="posts"
         )
+        assert sg_doc is not None, "Document should exist in SGW"
         cbl1_doc = await db1.get_document(DocumentEntry("_default.posts", "post_1000"))
         cbl2_doc = await db2.get_document(DocumentEntry("_default.posts", "post_1000"))
         cbl3_doc = await db3.get_document(DocumentEntry("_default.posts", "post_1000"))
         assert (
-            sg_doc is not None
-            and cbl1_doc is not None
-            and cbl2_doc is not None
-            and cbl3_doc is not None
-            and sg_doc.body.get("title")
+            sg_doc.body.get("title")
             == cbl1_doc.body.get("title")
             == cbl2_doc.body.get("title")
             == cbl3_doc.body.get("title")
@@ -501,12 +498,9 @@ async def test_multiple_cbls_updates_concurrently_with_pull(
         sg_doc = await cblpytest.sync_gateways[0].get_document(
             "posts", "post_1000", collection="posts"
         )
+        assert sg_doc is not None, "Document should exist in SGW"
         assert (
-            sg_doc is not None
-            and cbl1_doc is not None
-            and cbl2_doc is not None
-            and cbl3_doc is not None
-            and cbl1_doc.body.get("title")
+            cbl1_doc.body.get("title")
             == cbl2_doc.body.get("title")
             == cbl3_doc.body.get("title")
             == sg_doc.body.get("title")
@@ -550,12 +544,9 @@ async def test_multiple_cbls_updates_concurrently_with_pull(
         sg_doc = await cblpytest.sync_gateways[0].get_document(
             "posts", "post_1000", collection="posts"
         )
+        assert sg_doc is not None, "Document should exist in SGW"
         assert (
-            sg_doc is not None
-            and cbl1_doc is not None
-            and cbl2_doc is not None
-            and cbl3_doc is not None
-            and cbl1_doc.body.get("title")
+            cbl1_doc.body.get("title")
             == cbl2_doc.body.get("title")
             == cbl3_doc.body.get("title")
             == sg_doc.body.get("title")

tests/QE/test_replicator_encryption_hook.py

@@ -306,6 +306,7 @@ async def test_delta_sync_with_encryption(
         sgw_doc = await cblpytest.sync_gateways[0].get_document(
             "travel", "hotel_2", "travel", "hotels"
         )
+        assert sgw_doc is not None, "Document should exist in SGW"
         updated_doc_bytes = len(json.dumps(sgw_doc.body).encode("utf-8"))
         delta_bytes = bytes_written_after - bytes_written_before
         assert delta_bytes < updated_doc_bytes, (