+
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/runtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ run-name: Run test suite for trac-github
on: [pull_request]
jobs:
runtests-py2:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: python:2.7.18-buster

Expand Down
20 changes: 10 additions & 10 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1528,8 +1528,8 @@ def test_006_normal_operation(self):
"slug": u"gentlepeople"
}
],
'/teams/1/members': team1members,
'/teams/12/members': team12members
'/organizations/%s/team/1/members' % self.organization: team1members,
'/organizations/%s/team/12/members' % self.organization: team12members
})

with TracContext(self, env=self.tracd_env_debug, **self.trac_env):
Expand Down Expand Up @@ -1711,8 +1711,8 @@ def test_012_hook_membership_event_delete_team(self):
"slug": u"gentlepeople"
}
],
'/teams/1/members': team1members,
'/teams/12/members': team12members
'/organizations/%s/team/1/members' % self.organization: team1members,
'/organizations/%s/team/12/members' % self.organization: team12members
})

update = {
Expand Down Expand Up @@ -1744,7 +1744,7 @@ def test_012_hook_membership_event_delete_team(self):
"slug": u"gentlepeople"
}
],
'/teams/12/members': team12members
'/organizations/%s/team/12/members' % self.organization: team12members
})

# Send the delete event
Expand Down Expand Up @@ -1829,7 +1829,7 @@ def test_014_hook_membership_event_add_team(self):
"slug": u"justice-league"
},
],
'/teams/1/members': team1members,
'/organizations/%s/team/1/members' % self.organization: team1members,
})

# Send the update event
Expand Down Expand Up @@ -1872,7 +1872,7 @@ def test_015_hook_membership_event_add_member(self):
"slug": u"justice-league"
},
],
'/teams/1/members': list(team1members)
'/organizations/%s/team/1/members' % self.organization: list(team1members)
})

update = {
Expand All @@ -1894,7 +1894,7 @@ def test_015_hook_membership_event_add_member(self):
"slug": u"justice-league"
},
],
'/teams/1/members': list(team1members)
'/organizations/%s/team/1/members' % self.organization: list(team1members)
})

# Send the update event
Expand Down Expand Up @@ -1937,7 +1937,7 @@ def test_016_hook_membership_event_remove_member(self):
"slug": u"justice-league"
},
],
'/teams/1/members': list(team1members)
'/organizations/%s/team/1/members' % self.organization: list(team1members)
})

update = {
Expand All @@ -1959,7 +1959,7 @@ def test_016_hook_membership_event_remove_member(self):
"slug": u"justice-league"
},
],
'/teams/1/members': list(team1members)
'/organizations/%s/team/1/members' % self.organization: list(team1members)
})

# Send the update event
Expand Down
3 changes: 2 additions & 1 deletion tracext/github/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,12 @@ def __init__(self, api, env, org, teamid, slug): # pylint: disable=too-many-argu
:param slug: the GitHub team shortname in URL representation
"""
self._teamid = teamid
self._orgid = org
fullname = '-'.join(['github', org, slug])
super(GitHubTeam, self).__init__(api, env, fullname)

def _apicall_parameters(self):
return ("teams/{}/members", self._teamid)
return ("organizations/{}/team/{}/members", self._orgid, self._teamid)

#class GitHubOrgMembers(GitHubUserCollection):
# """
Expand Down
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载