@@ -94,7 +94,7 @@ private function approveGroup($uid)
94
94
// does not remove user from PI groups
95
95
private function ensureUserDoesNotExist ()
96
96
{
97
- global $ USER , $ SQL , $ LDAP ;
97
+ global $ USER , $ SQL , $ LDAP , $ REDIS ;
98
98
$ SQL ->deleteRequestsByUser ($ USER ->uid );
99
99
if ($ USER ->exists ()) {
100
100
$ org = $ USER ->getOrgGroup ();
@@ -116,6 +116,7 @@ private function ensureUserDoesNotExist()
116
116
$ all_users_group ->write ();
117
117
assert (!in_array ($ USER ->uid , $ all_users_group ->getAttribute ("memberuid " )));
118
118
}
119
+ $ REDIS ->removeCacheArray ("sorted_users " , "" , $ USER ->uid );
119
120
}
120
121
121
122
private function ensureOrgGroupDoesNotExist ()
@@ -126,24 +127,28 @@ private function ensureOrgGroupDoesNotExist()
126
127
$ org_group ->delete ();
127
128
assert (!$ org_group ->exists ());
128
129
}
130
+ $ REDIS ->removeCacheArray ("sorted_orgs " , "" , $ SSO ["org " ]);
129
131
}
130
132
131
133
private function ensureUserNotInPIGroup (UnityGroup $ pi_group )
132
134
{
133
- global $ USER ;
135
+ global $ USER , $ REDIS ;
134
136
if ($ pi_group ->userExists ($ USER )) {
135
137
$ pi_group ->removeUser ($ USER );
136
138
assert (!$ pi_group ->userExists ($ USER ));
137
139
}
140
+ $ REDIS ->removeCacheArray ($ pi_group ->gid , "members " , $ USER ->uid );
138
141
}
139
142
140
143
private function ensurePIGroupDoesNotExist ()
141
144
{
142
- global $ USER , $ LDAP ;
145
+ global $ USER , $ LDAP , $ REDIS ;
146
+ $ gid = $ USER ->getPIGroup ()->gid ;
143
147
if ($ USER ->getPIGroup ()->exists ()) {
144
- $ LDAP ->getPIGroupEntry ($ USER -> getPIGroup ()-> gid )->delete ();
148
+ $ LDAP ->getPIGroupEntry ($ gid )->delete ();
145
149
assert (!$ USER ->getPIGroup ()->exists ());
146
150
}
151
+ $ REDIS ->removeCacheArray ("sorted_groups " , "" , $ gid );
147
152
}
148
153
149
154
public function testCreateUserByJoinGoupByPI ()
@@ -327,6 +332,7 @@ public function testCreateUserByCreateGroup()
327
332
// $this->assertTrue($third_request_failed);
328
333
$ this ->assertRequestedPIGroup (false );
329
334
} finally {
335
+ switchUser (...$ user_to_create_args );
330
336
$ this ->ensureOrgGroupDoesNotExist ();
331
337
$ this ->ensurePIGroupDoesNotExist ();
332
338
$ this ->ensureUserDoesNotExist ();
0 commit comments