1515# Specify a unique prefix to avoid collisions with existing data
1616OBJECT_PREFIX = "tmlp_"
1717
18- org_name = f"{ OBJECT_PREFIX } org"
18+ org_name = f"{ OBJECT_PREFIX } org_full_name"
19+ org_short_name = f"{ OBJECT_PREFIX } org"
1920lib_name = f"{ OBJECT_PREFIX } library"
2021group_name = f"{ OBJECT_PREFIX } test_group"
2122user_names = [f"{ OBJECT_PREFIX } user{ i } " for i in range (3 )]
@@ -40,7 +41,7 @@ def setUp(self):
4041 """
4142 # Create ContentLibrary
4243
43- org = Organization .objects .create (name = org_name , short_name = org_name )
44+ org = Organization .objects .create (name = org_name , short_name = org_short_name )
4445 library = ContentLibrary .objects .create (org = org , slug = lib_name )
4546
4647 # Create Users and Groups
@@ -104,12 +105,12 @@ def tearDown(self):
104105 batch_unassign_role_from_users (
105106 users = user_names ,
106107 role_external_key = LIBRARY_ADMIN .external_key ,
107- scope_external_key = f"lib:{ org_name } :{ lib_name } " ,
108+ scope_external_key = f"lib:{ org_short_name } :{ lib_name } " ,
108109 )
109110 batch_unassign_role_from_users (
110111 users = group_user_names ,
111112 role_external_key = LIBRARY_USER .external_key ,
112- scope_external_key = f"lib:{ org_name } :{ lib_name } " ,
113+ scope_external_key = f"lib:{ org_short_name } :{ lib_name } " ,
113114 )
114115
115116 ContentLibrary .objects .filter (slug = lib_name ).delete ()
@@ -133,13 +134,13 @@ def test_migration(self):
133134 AuthzEnforcer .get_enforcer ().load_policy ()
134135 for user_name in user_names :
135136 assignments = get_user_role_assignments_in_scope (
136- user_external_key = user_name , scope_external_key = f"lib:{ org_name } :{ lib_name } "
137+ user_external_key = user_name , scope_external_key = f"lib:{ org_short_name } :{ lib_name } "
137138 )
138139 self .assertEqual (len (assignments ), 1 )
139140 self .assertEqual (assignments [0 ].roles [0 ], LIBRARY_ADMIN )
140141 for group_user_name in group_user_names :
141142 assignments = get_user_role_assignments_in_scope (
142- user_external_key = group_user_name , scope_external_key = f"lib:{ org_name } :{ lib_name } "
143+ user_external_key = group_user_name , scope_external_key = f"lib:{ org_short_name } :{ lib_name } "
143144 )
144145 self .assertEqual (len (assignments ), 1 )
145146 self .assertEqual (assignments [0 ].roles [0 ], LIBRARY_USER )
0 commit comments