Skip to content

Commit baa7562

Browse files
Synchronize COMMON_DOC_KEY with self.key across tests
Change-Id: I37b2c4d456d11cf6087a5ddd694b8c93b9a6fb61 Reviewed-on: https://review.couchbase.org/c/TAF/+/244087 Reviewed-by: Ashwin <ashwin.govindarajulu@couchbase.com> Tested-by: <shiva.adky@couchbase.com> Tested-by: Build Bot <build@couchbase.com>
1 parent 1c11e98 commit baa7562

5 files changed

Lines changed: 23 additions & 6 deletions

File tree

pytests/bucket_collections/collections_base.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,9 @@ def over_ride_bucket_template_params(test_obj, bucket_storage,
976976

977977
@staticmethod
978978
def over_ride_doc_loading_template_params(test_obj, target_spec):
979+
if target_spec and "doc_crud" in target_spec:
980+
target_spec["doc_crud"][MetaCrudParams.DocCrud.COMMON_DOC_KEY] = test_obj.key
981+
979982
for key, value in test_obj.input.test_params.items():
980983
if key == "durability":
981984
target_spec[MetaCrudParams.DURABILITY_LEVEL] = \

pytests/bucket_collections/flush_test.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def __get_mutate_spec(doc_ttl, durability):
6363
# Doc loading params
6464
"doc_crud": {
6565
MetaCrudParams.DocCrud.NUM_ITEMS_FOR_NEW_COLLECTIONS: 5000,
66-
MetaCrudParams.DocCrud.COMMON_DOC_KEY: "test_collections",
66+
MetaCrudParams.DocCrud.COMMON_DOC_KEY: self.key,
6767
MetaCrudParams.DocCrud.CREATE_PERCENTAGE_PER_COLLECTION: 100,
6868
},
6969

@@ -93,6 +93,7 @@ def run_collection_mutatation(self, doc_ttl, durability):
9393
"doc_ttl: %s, durability: %s"
9494
% (doc_ttl, durability))
9595
mutate_spec = self.__get_mutate_spec(doc_ttl, durability)
96+
CollectionBase.over_ride_doc_loading_template_params(self, mutate_spec)
9697
doc_loading_task = \
9798
self.bucket_util.run_scenario_from_spec(
9899
self.task,
@@ -133,6 +134,8 @@ def load_initial_data(self):
133134
self.log.info("Loading same docs back into collections")
134135
doc_loading_spec = \
135136
self.bucket_util.get_crud_template_from_package("initial_load")
137+
CollectionBase.over_ride_doc_loading_template_params(
138+
self, doc_loading_spec)
136139

137140
doc_loading_task = \
138141
self.bucket_util.run_scenario_from_spec(
@@ -228,7 +231,7 @@ def test_flush_bucket_during_mutations(self):
228231
MetaCrudParams.COLLECTIONS_TO_ADD_PER_BUCKET: 0,
229232

230233
"doc_crud": {
231-
MetaCrudParams.DocCrud.COMMON_DOC_KEY: "test_collections",
234+
MetaCrudParams.DocCrud.COMMON_DOC_KEY: self.key,
232235
MetaCrudParams.DocCrud.CREATE_PERCENTAGE_PER_COLLECTION: 20,
233236
MetaCrudParams.DocCrud.READ_PERCENTAGE_PER_COLLECTION: 20,
234237
MetaCrudParams.DocCrud.UPDATE_PERCENTAGE_PER_COLLECTION: 20,
@@ -257,11 +260,13 @@ def test_flush_bucket_during_mutations(self):
257260

258261
self.log.info("Running mutations with doc_ttl: %s, durability: %s"
259262
% (doc_ttl, durability_level))
260-
mutate_task = \
261-
self.bucket_util.run_scenario_from_spec(
263+
CollectionBase.over_ride_doc_loading_template_params(
264+
self, mutate_spec)
265+
mutate_task = self.bucket_util.run_scenario_from_spec(
262266
self.task,
263267
self.cluster,
264268
self.cluster.buckets,
269+
265270
mutate_spec,
266271
mutation_num=0,
267272
async_load=True,
@@ -325,6 +330,8 @@ def test_data_post_flush(self):
325330
doc_ttl, durability_level = \
326331
self.__get_random_doc_ttl_and_durability_level()
327332
mutate_spec = self.__get_mutate_spec(doc_ttl, durability_level)
333+
CollectionBase.over_ride_doc_loading_template_params(
334+
self, mutate_spec)
328335
mutate_spec[
329336
MetaCrudParams.DocCrud.UPDATE_PERCENTAGE_PER_COLLECTION] = 50
330337
mutate_spec[

pytests/bucket_collections/rollback_tests.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ def __rewind_doc_index(self, doc_loading_task):
8080
def load_docs(self, doc_ops):
8181
load_spec = dict()
8282
load_spec["doc_crud"] = dict()
83-
load_spec["doc_crud"][MetaCrudParams.DocCrud.COMMON_DOC_KEY] \
84-
= "test_collections"
83+
load_spec["doc_crud"][MetaCrudParams.DocCrud.COMMON_DOC_KEY] = self.key
84+
85+
8586
load_spec[MetaCrudParams.TARGET_VBUCKETS] = self.target_vbuckets
8687
load_spec[MetaCrudParams.COLLECTIONS_CONSIDERED_FOR_CRUD] = 3
8788
load_spec[MetaCrudParams.SCOPES_CONSIDERED_FOR_CRUD] = "all"

pytests/rebalance_new/auto_retry_failed_rebalance.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ def async_data_load(self):
7171
doc_loading_spec = self.bucket_util.get_crud_template_from_package(
7272
"volume_test_load")
7373
self.set_retry_exceptions(doc_loading_spec)
74+
CollectionBase.over_ride_doc_loading_template_params(
75+
self, doc_loading_spec)
76+
7477
tasks = self.bucket_util.run_scenario_from_spec(
7578
self.task,
7679
self.cluster,

pytests/volumetests/Collections.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,9 @@ def data_load_collection(self, async_load=True, skip_read_success_results=True):
592592
doc_loading_spec = \
593593
self.bucket_util.get_crud_template_from_package(self.data_load_spec)
594594
self.set_retry_exceptions(doc_loading_spec)
595+
CollectionBase.over_ride_doc_loading_template_params(
596+
self, doc_loading_spec)
597+
595598
doc_loading_spec[MetaCrudParams.DURABILITY_LEVEL] = self.durability_level
596599
doc_loading_spec[MetaCrudParams.SKIP_READ_SUCCESS_RESULTS] = skip_read_success_results
597600
task = self.bucket_util.run_scenario_from_spec(self.task,

0 commit comments

Comments
 (0)