Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

Commit f1eddb4

Browse files
fix test
1 parent 3b28bbb commit f1eddb4

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tasks/sync_teams.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,14 @@ def run_impl(self, db_session, ownerid, *, username=None, **kwargs):
5858
ownerid=ownerid,
5959
),
6060
)
61-
for org in removed_orgs:
62-
org.plan_activated_users.remove(ownerid)
61+
for org_ownerid in removed_orgs:
62+
org = db_session.query(Owner).filter(Owner.ownerid == org_ownerid).first()
63+
if org and ownerid in org.plan_activated_users:
64+
log.info(
65+
"Removing user from org's plan_activated_users",
66+
extra=dict(user_ownerid=ownerid, org_ownerid=org_ownerid)
67+
)
68+
org.plan_activated_users.remove(ownerid)
6369

6470
owner.updatestamp = datetime.now()
6571
owner.organizations = team_ids

tasks/tests/unit/test_sync_teams_task.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ def test_team_removed(self, mocker, mock_configuration, dbsession, codecov_vcr):
3737
service="github",
3838
unencrypted_oauth_token=token,
3939
)
40+
prev_team.plan_activated_users = [user.ownerid]
4041
dbsession.add(user)
4142
dbsession.flush()
4243
SyncTeamsTask().run_impl(dbsession, user.ownerid, using_integration=False)
4344
assert prev_team.ownerid not in user.organizations
45+
assert user.ownerid not in prev_team.plan_activated_users
4446

4547
def test_team_data_updated(
4648
self, mocker, mock_configuration, dbsession, codecov_vcr

0 commit comments

Comments
 (0)