Commit ebee49a4 authored by Stefan Krah's avatar Stefan Krah

Issue #14110: Fix test failures on FreeBSD if the user is in the wheel group.

parent 13fe6d1c
...@@ -49,6 +49,9 @@ if hasattr(sys, 'thread_info') and sys.thread_info.version: ...@@ -49,6 +49,9 @@ if hasattr(sys, 'thread_info') and sys.thread_info.version:
else: else:
USING_LINUXTHREADS = False USING_LINUXTHREADS = False
# Issue #14110: Some tests fail on FreeBSD if the user is in the wheel group.
HAVE_WHEEL_GROUP = sys.platform.startswith('freebsd') and os.getgid() == 0
# Tests creating TESTFN # Tests creating TESTFN
class FileTests(unittest.TestCase): class FileTests(unittest.TestCase):
def setUp(self): def setUp(self):
...@@ -1240,7 +1243,7 @@ if sys.platform != 'win32': ...@@ -1240,7 +1243,7 @@ if sys.platform != 'win32':
if hasattr(os, 'setgid'): if hasattr(os, 'setgid'):
def test_setgid(self): def test_setgid(self):
if os.getuid() != 0: if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
self.assertRaises(os.error, os.setgid, 0) self.assertRaises(os.error, os.setgid, 0)
self.assertRaises(OverflowError, os.setgid, 1<<32) self.assertRaises(OverflowError, os.setgid, 1<<32)
...@@ -1252,7 +1255,7 @@ if sys.platform != 'win32': ...@@ -1252,7 +1255,7 @@ if sys.platform != 'win32':
if hasattr(os, 'setegid'): if hasattr(os, 'setegid'):
def test_setegid(self): def test_setegid(self):
if os.getuid() != 0: if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
self.assertRaises(os.error, os.setegid, 0) self.assertRaises(os.error, os.setegid, 0)
self.assertRaises(OverflowError, os.setegid, 1<<32) self.assertRaises(OverflowError, os.setegid, 1<<32)
...@@ -1272,7 +1275,7 @@ if sys.platform != 'win32': ...@@ -1272,7 +1275,7 @@ if sys.platform != 'win32':
if hasattr(os, 'setregid'): if hasattr(os, 'setregid'):
def test_setregid(self): def test_setregid(self):
if os.getuid() != 0: if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
self.assertRaises(os.error, os.setregid, 0, 0) self.assertRaises(os.error, os.setregid, 0, 0)
self.assertRaises(OverflowError, os.setregid, 1<<32, 0) self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
self.assertRaises(OverflowError, os.setregid, 0, 1<<32) self.assertRaises(OverflowError, os.setregid, 0, 1<<32)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment