Removed additional add_document function from couchbaseserver.py and modified overwritten changes to non-edge server code

Author: barkha06

client/src/cbltest/api/couchbaseserver.py

@@ -594,4 +594,4 @@ def stop_xcdr(self, target: "CouchbaseServer", bucket_name: str) -> None:
                     resp = session.delete(
                         f"http://{self.__hostname}:8091/controller/cancelXDCR/{encoded}",
                     )
-                    resp.raise_for_status()
+                    resp.raise_for_status()

client/src/cbltest/api/jsongenerator.py

@@ -34,7 +34,7 @@ async def test_blobs_create_delete(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("2 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -753,7 +753,7 @@ async def test_blob_special_characters(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("2 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_blobs.py

@@ -33,7 +33,7 @@ async def test_changes_feed_longpoll(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_changes_feed.py

@@ -11,7 +11,7 @@
 from cbltest.api.cloud import CouchbaseCloud
 from cbltest.api.edgeserver import BulkDocOperation
 from cbltest.api.httpclient import ClientFactory, HTTPClient
-from cbltest.api.jsongenerator import JSONGenerator
+from cbltest.api.json_generator import JSONGenerator
 
 
 class TestEdgeServerChaos(CBLTestClass):

tests/QE/edge_server/test_chaos_scenarios.py

@@ -32,7 +32,7 @@ async def test_conflicts(self, cblpytest: CBLPyTest, dataset_path: Path) -> None
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_conflicts.py

@@ -40,7 +40,7 @@ async def test_end_to_end_sgw(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_end_to_end.py

@@ -33,7 +33,7 @@ async def test_audit_logging_default(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -170,7 +170,7 @@ async def test_audit_logging_disabled(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -288,7 +288,7 @@ async def test_audit_logging_enabled(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_logging.py

@@ -44,7 +44,7 @@ async def test_system_one_client_l(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -376,7 +376,7 @@ async def test_system_one_client_chaos(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -759,7 +759,7 @@ async def test_system_multiple_clients_l(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -1203,7 +1203,7 @@ async def test_system_multiple_clients_chaos(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(