Skip to content

Commit d619d79

Browse files
ritamcouchbasebkumaran
authored andcommitted
Fix issues with security tests
Updated tests with right audit records Remove test cases that have defects in mad-hatter Change-Id: I8e2811f724cb2413f8f10fd88b2a7ff352f148b7 Reviewed-on: http://review.couchbase.org/118942 Reviewed-by: Balakumaran G <balakumaran.gopal@couchbase.com> Tested-by: Balakumaran G <balakumaran.gopal@couchbase.com>
1 parent 6dad049 commit d619d79

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

conf/failover/py-newfailover.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ failover.failovertests.FailoverTests:
2121
test_failover_normal,replicas=1,num_failed_nodes=1,items=200000,vbuckets=1024,total_vbuckets=1024,stopGracefulFailover=True,graceful=True,GROUP=P0;GRACEFUL
2222
#test_failover_then_add_back,replicas=2,num_failed_nodes=1,items=100000,standard_buckets=1,recoveryType=full,deltaRecoveryBuckets=default,graceful=True,GROUP=P1;GRACEFUL
2323
#test_failover_then_add_back,replicas=2,num_failed_nodes=2,items=100000,standard_buckets=1,recoveryType=delta:full,graceful=True,GROUP=P2;GRACEFUL
24-
test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=full,graceful=True,GROUP=P0;GRACEFUL
24+
#test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=full,graceful=True,GROUP=P0;GRACEFUL
2525
test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=delta,graceful=True,GROUP=P0;GRACEFUL
2626
test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,compact=True,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=delta,graceful=True,GROUP=P1;GRACEFUL
2727
test_failover_stop_server,replicas=1,graceful=False,num_failed_nodes=1,load_ratio=10,GROUP=P1
@@ -30,4 +30,4 @@ failover.failovertests.FailoverTests:
3030
test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,load_ratio=1,failoverMaster=True,GROUP=P1
3131
test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,load_ratio=1,GROUP=P1
3232
test_failover_stop_server,replicas=2,graceful=False,num_failed_nodes=2,items=20000,GROUP=P0
33-
test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,items=100000,compact=True,load_ratio=1,GROUP=P1
33+
test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,items=100000,compact=True,load_ratio=1,GROUP=P2

conf/py-epeng-basic-ops.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ epengine.basic_ops.basic_ops:
1111
test_diag_eval_curl,disable_diag_eval_non_local=True
1212
test_diag_eval_curl,disable_diag_eval_non_local=False
1313
test_compression_active_and_off,items=10000,compression_mode=active
14-
do_get_random_key
14+
#do_get_random_key - Existing bug

conf/security/py-rbac-extended.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ security.rbacTest.rbacTest:
55
test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default],role_map=bucket_view_admin
66
test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin,role_map=admin
77
test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin:bucket_admin[default],role_map=admin
8-
test_role_permission_validate_multiple,user_id=ritam:password,user_role=cluster_admin:bucket_admin[default]:views_admin[default]:replication_admin,role_map=cluster_view_admin
98
test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default]:replication_admin,role_map=bucket_view_replication_admin
109
test_role_permission_validate_multiple,user_id=ritam:password,user_role=ro_admin:replication_admin,role_map=replication_admin_no_access
1110
test_role_permission_validate_multiple,user_id=ritam:password,user_role=replication_admin:views_admin[default],role_map=view_replication_admin

conf/security/py-rbac.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ security.rbacTest.rbacTest:
2626
test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin,role_map=admin,GROUP=P0;INTUSER
2727
test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin:bucket_admin[default],role_map=admin,GROUP=P0;INTUSER
2828
test_role_permission_validate_multiple,user_id=ritam:password,user_role=cluster_admin:bucket_admin[default]:views_admin[default]:replication_admin,role_map=cluster_view_admin,GROUP=P1;INTUSER
29-
test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default]:replication_admin,role_map=bucket_view_replication_admin,GROUP=P0;INTUSER
29+
test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default]:replication_admin,role_map=bucket_view_replication_admin,GROUP=P1;INTUSER
3030
test_role_permission_validate_multiple,user_id=ritam:password,user_role=ro_admin:replication_admin,role_map=replication_admin_no_access,GROUP=P0;INTUSER
3131
test_role_permission_validate_multiple,user_id=ritam:password,user_role=replication_admin:views_admin[default],role_map=view_replication_admin,GROUP=P0;INTUSER
3232

@@ -48,7 +48,7 @@ security.rbacTest.rbacTest:
4848

4949

5050
test_add_remove_users,user_id=ritam:password?dave:password,user_role=admin:ro_admin,role_map=admin,GROUP=P0;INTUSER
51-
test_add_remove_user_check_permission,user_id=ritam:password?dave:password,user_role=admin:ro_admin,role_map=admin,GROUP=P0;INTUSER
51+
test_add_remove_user_check_permission,user_id=ritam:password?dave:password,user_role=admin:ro_admin,role_map=admin,GROUP=P1;INTUSER
5252
test_add_remove_users,user_id=ritam:password?dave:password,user_role=bucket_admin[default],role_map=bucket_admin,GROUP=P0;INTUSER
5353
test_add_remove_user_check_permission,user_id=ritam:password?dave:password,user_role=bucket_admin[default],role_map=bucket_admin,GROUP=P1;INTUSER
5454
test_add_remove_some_user_check_permission,user_id=ritam:password?dave:password,user_role=bucket_admin[default],role_map=bucket_admin,GROUP=P1;INTUSER

conf/tunable-mem/py-newrebalance-in-out.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rebalance.rebalanceinout.RebalanceInOutTests:
66
test_incremental_rebalance_out_in_with_mutation,,replicas=2,value_size=2048,GROUP=IN_OUT;P1
77
test_incremental_rebalance_out_in_with_mutation,,init_num_nodes=3,items=0,GROUP=IN_OUT;P0
88
test_incremental_rebalance_out_in_with_mutation,,replicas=3,init_num_nodes=3,GROUP=IN_OUT;P2
9-
test_rebalance_in_out_at_once_persistence_stopped,items=100000,num_nodes_with_stopped_persistence=1,num_items_without_persistence=1000,nodes_out=0,GROUP=IN_OUT;P0;FROM_2_0
9+
#test_rebalance_in_out_at_once_persistence_stopped,items=100000,num_nodes_with_stopped_persistence=1,num_items_without_persistence=1000,nodes_out=0,GROUP=IN_OUT;P0;FROM_2_0
1010
#MB-7386 test_rebalance_in_out_at_once_persistence_stopped,items=1000,num_nodes_with_stopped_persistence=3,num_items_without_persistence=1000,sasl_buckets=1,standard_buckets=1,nodes_init=3,nodes_in=2,nodes_out=1,GROUP=IN_OUT;P1;FROM_2_0
1111
#MB-7386 test_rebalance_in_out_at_once_persistence_stopped,items=0,num_nodes_with_stopped_persistence=4,num_items_without_persistence=1000,sasl_buckets=1,standard_buckets=1,nodes_init=3,nodes_in=1,nodes_out=2,GROUP=IN_OUT;P2;FROM_2_0
1212
test_rebalance_in_out_at_once,default_bucket=True,standard_buckets=1,sasl_buckets=1,replicas=1,nodes_init=3,nodes_in=1,nodes_out=1,items=700000,max_verify=50000,GROUP=IN_OUT;P0;PERFORMANCE

pytests/security/rbacTest.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ def setUp(self):
6262
RbacBase().create_user_source(testuser, 'builtin', self.master)
6363
self.sleep(10)
6464
self.ldap_server = ServerInfo(self.ldapHost, self.ldapPort, 'root', 'couchbase')
65-
self.ipAddress = self.getLocalIPAddress()
65+
#self.ipAddress = self.getLocalIPAddress()
66+
self.ipAddress = '127.0.0.1'
6667

6768

6869
def tearDown(self):
@@ -358,15 +359,15 @@ def test_role_assignment_audit(self):
358359
source = 'local'
359360
else:
360361
source = 'external'
361-
expectedResults = {"full_name":"'RitamSharma'","roles":["admin"],"identity:source":source,"identity:user":userid[0],
362-
"real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],
363-
"ip":self.ipAddress, "port":123456}
362+
expectedResults = {"roles":["admin"],"identity:source":source,"identity:user":userid[0],
363+
"real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],"reason":"updated",
364+
"ip":self.ipAddress, "port":123456,"full_name":"'RitamSharma'"}
364365
if ops == 'edit':
365366
payload = "name=" + user_name + "&roles=" + 'admin,cluster_admin'
366367
status, content, header = rbacmain(self.master, self.auth_type)._set_user_roles(user_name=userid[0],payload=payload)
367-
expectedResults = {"full_name":"'RitamSharma'","roles":["admin","cluster_admin"],"identity:source":source,"identity:user":userid[0],
368-
"real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],
369-
"ip":self.ipAddress, "port":123456}
368+
expectedResults = {"roles":["admin","cluster_admin"],"identity:source":source,"identity:user":userid[0],
369+
"real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],"reason":"updated",
370+
"ip":self.ipAddress, "port":123456,"full_name":"'RitamSharma'"}
370371
elif ops == 'remove':
371372
status, content, header = rbacmain(self.master,self.auth_type)._delete_user(userid[0])
372373
expectedResults = {"identity:source":source,"identity:user":userid[0],

0 commit comments

Comments
 (0)