Skip to content

Commit

Permalink
Fixes for magma tests 8.0
Browse files Browse the repository at this point in the history 
Change-Id: I5a5314ed6cc2da8cc2a7efae136d2a30070a5050
Reviewed-on: https://review.couchbase.org/c/TAF/+/222290
Tested-by: Build Bot <[email protected]>
Reviewed-by: <[email protected]>
  • Loading branch information
@vibhavshiras1
vibhavshiras1 committed Jan 28, 2025
1 parent 81b0ce2 commit 0f82f4e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions conf/ns_server/bucket_create.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ buckettests.createbuckettests.CreateBucketTests:
# Dedupe retention tests
bucket_collections.history_retention.DocHistoryRetention:
# Bucket create tests
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=0,bucket_history_retention_bytes=0,num_items=10000,create_by=rest,check_dedup_verification=False
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=cbcli,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=1,bucket_history_retention_bytes=18446744073709551615,num_items=100000,create_by=rest,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=864000,bucket_history_retention_bytes=18446744073709551615,num_items=100000,create_by=rest,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=0,bucket_history_retention_bytes=0,num_items=10000,create_by=rest,check_dedup_verification=False,sdk_client_pool=True
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC,sdk_client_pool=True
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=cbcli,GROUP=CDC,sdk_client_pool=True
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=1,bucket_history_retention_bytes=18446744073709551615,num_items=100000,create_by=rest,GROUP=CDC,sdk_client_pool=True
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=864000,bucket_history_retention_bytes=18446744073709551615,num_items=100000,create_by=rest,GROUP=CDC,sdk_client_pool=True
# Case with one of the retention time/size=0
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=100,bucket_history_retention_bytes=0,num_items=100000,create_by=rest,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=0,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=100,bucket_history_retention_bytes=0,num_items=100000,create_by=rest,GROUP=CDC,sdk_client_pool=True
test_create_bucket_with_doc_history_enabled,nodes_init=1,replicas=0,bucket_history_retention_seconds=0,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC,sdk_client_pool=True
# Bucket create + multi node tests
test_create_bucket_with_doc_history_enabled,nodes_init=3,replicas=2,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=3,replicas=2,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=cbcli,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=3,replicas=2,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC,sdk_client_pool=True
test_create_bucket_with_doc_history_enabled,nodes_init=3,replicas=2,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=cbcli,GROUP=CDC,sdk_client_pool=True
# Bucket create with multi-collection scenario
test_create_bucket_with_doc_history_enabled,nodes_init=1,bucket_spec=single_bucket.history_retention_tests,replicas=0,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC
test_create_bucket_with_doc_history_enabled,nodes_init=3,bucket_spec=single_bucket.history_retention_tests,replicas=2,bucket_history_retention_seconds=100,bucket_history_retention_bytes=2147483648,num_items=100000,create_by=rest,GROUP=CDC
Expand Down
2 changes: 1 addition & 1 deletion pytests/bucket_collections/history_retention.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ def test_enabling_cdc_post_creation(self):
client = self.cluster.sdk_client_pool.get_client_for_bucket(
bucket, collection=col)
keys = list()
for vb_num in range(0, self.cluster.vbuckets):
for vb_num in range(0, bucket.numVBuckets):
key, val = doc_generator("test_doc", 0, 1,
target_vbucket=[vb_num]).next()
keys.append(key)
Expand Down
4 changes: 2 additions & 2 deletions pytests/storage/magma/magma_cbdatarecovery.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ def validate_document_metadata(self, bucket_name, scope, collection):
if bucket.name == bucket_name:
dst_bucket = bucket

src_client = SDKClient([self.first_cluster_master], src_bucket,
src_client = SDKClient(self.first_cluster, src_bucket,
scope=scope, collection=collection)
dst_client = SDKClient([self.second_cluster_master], dst_bucket,
dst_client = SDKClient(self.second_cluster, dst_bucket,
scope=scope, collection=collection)

shell_source = RemoteMachineShellConnection(self.first_cluster_master)
Expand Down

0 comments on commit 0f82f4e

Please sign in to comment.