Skip to content

bpo-36046: Fix buildbot failures from the PR. #16091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 13, 2019
Merged

bpo-36046: Fix buildbot failures from the PR. #16091

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24104f9
bpo-36046: Fix buildbot failures from the PR.
gpshead Sep 13, 2019
0f1d214
Refactor the group finding code into a fn.
gpshead Sep 13, 2019
eccde64
byebye staticmethod!
gpshead Sep 13, 2019
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
20 changes: 17 additions & 3 deletions Lib/test/test_subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1588,6 +1588,18 @@ def test_run_with_shell_timeout_and_capture_output(self):
f"{stacks}```")


def _get_test_grp_name():
for name_group in ('staff', 'nogroup', 'grp'):
if grp:
try:
grp.getgrnam(name_group)
except KeyError:
continue
return name_group
else:
raise unittest.SkipTest('No identified group name to use for this test on this platform.')


@unittest.skipIf(mswindows, "POSIX specific tests")
class POSIXProcessTestCase(BaseTestCase):

Expand Down Expand Up @@ -1762,8 +1774,10 @@ def test_user(self):
[sys.executable, "-c",
"import os; print(os.getuid())"],
user=user)
except PermissionError: # errno.EACCES
pass
except OSError as e:
if e.errno != errno.EPERM:
if e.errno not in (errno.EACCES, errno.EPERM):
raise
else:
if isinstance(user, str):
Expand All @@ -1789,7 +1803,7 @@ def test_user_error(self):
def test_group(self):
gid = os.getegid()
group_list = [65534 if gid != 65534 else 65533]
name_group = "nogroup" if sys.platform != 'darwin' else "staff"
name_group = _get_test_grp_name()

if grp is not None:
group_list.append(name_group)
Expand Down Expand Up @@ -1830,7 +1844,7 @@ def test_group_error(self):
def test_extra_groups(self):
gid = os.getegid()
group_list = [65534 if gid != 65534 else 65533]
name_group = "nogroup" if sys.platform != 'darwin' else "staff"
name_group = _get_test_grp_name()
perm_error = False

if grp is not None:
Expand Down