aba719b9fe
- Remove patches 250, 253, 254 as the changes are already in Python 3.6.1rc1 - Update patch 157 to work with the new Python codebase - Remove README file from site-packages (upstream issue24633) - Rename README to README.rst according to upstream change (upstream PR#2) - Add patch 264 to skip a known test failure on aarch64 (upstream issue29804)
69 lines
3.3 KiB
Diff
69 lines
3.3 KiB
Diff
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
|
|
index e9fdb07..ea60e6e 100644
|
|
--- a/Lib/test/test_os.py
|
|
+++ b/Lib/test/test_os.py
|
|
@@ -1723,30 +1723,36 @@ class PosixUidGidTests(unittest.TestCase):
|
|
def test_setuid(self):
|
|
if os.getuid() != 0:
|
|
self.assertRaises(OSError, os.setuid, 0)
|
|
+ self.assertRaises(TypeError, os.setuid, 'not an int')
|
|
self.assertRaises(OverflowError, os.setuid, 1<<32)
|
|
|
|
@unittest.skipUnless(hasattr(os, 'setgid'), 'test needs os.setgid()')
|
|
def test_setgid(self):
|
|
if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
|
|
self.assertRaises(OSError, os.setgid, 0)
|
|
+ self.assertRaises(TypeError, os.setgid, 'not an int')
|
|
self.assertRaises(OverflowError, os.setgid, 1<<32)
|
|
|
|
@unittest.skipUnless(hasattr(os, 'seteuid'), 'test needs os.seteuid()')
|
|
def test_seteuid(self):
|
|
if os.getuid() != 0:
|
|
self.assertRaises(OSError, os.seteuid, 0)
|
|
+ self.assertRaises(TypeError, os.seteuid, 'not an int')
|
|
self.assertRaises(OverflowError, os.seteuid, 1<<32)
|
|
|
|
@unittest.skipUnless(hasattr(os, 'setegid'), 'test needs os.setegid()')
|
|
def test_setegid(self):
|
|
if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
|
|
self.assertRaises(OSError, os.setegid, 0)
|
|
+ self.assertRaises(TypeError, os.setegid, 'not an int')
|
|
self.assertRaises(OverflowError, os.setegid, 1<<32)
|
|
|
|
@unittest.skipUnless(hasattr(os, 'setreuid'), 'test needs os.setreuid()')
|
|
def test_setreuid(self):
|
|
if os.getuid() != 0:
|
|
self.assertRaises(OSError, os.setreuid, 0, 0)
|
|
+ self.assertRaises(TypeError, os.setreuid, 'not an int', 0)
|
|
+ self.assertRaises(TypeError, os.setreuid, 0, 'not an int')
|
|
self.assertRaises(OverflowError, os.setreuid, 1<<32, 0)
|
|
self.assertRaises(OverflowError, os.setreuid, 0, 1<<32)
|
|
|
|
@@ -1762,6 +1768,8 @@ class PosixUidGidTests(unittest.TestCase):
|
|
def test_setregid(self):
|
|
if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
|
|
self.assertRaises(OSError, os.setregid, 0, 0)
|
|
+ self.assertRaises(TypeError, os.setregid, 'not an int', 0)
|
|
+ self.assertRaises(TypeError, os.setregid, 0, 'not an int')
|
|
self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
|
|
self.assertRaises(OverflowError, os.setregid, 0, 1<<32)
|
|
|
|
diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py
|
|
index ac9cff7..db98159 100644
|
|
--- a/Lib/test/test_pwd.py
|
|
+++ b/Lib/test/test_pwd.py
|
|
@@ -104,11 +104,11 @@ class PwdTest(unittest.TestCase):
|
|
# In some cases, byuids isn't a complete list of all users in the
|
|
# system, so if we try to pick a value not in byuids (via a perturbing
|
|
# loop, say), pwd.getpwuid() might still be able to find data for that
|
|
- # uid. Using sys.maxint may provoke the same problems, but hopefully
|
|
+ # uid. Using 2**32 - 2 may provoke the same problems, but hopefully
|
|
# it will be a more repeatable failure.
|
|
# Android accepts a very large span of uids including sys.maxsize and
|
|
# -1; it raises KeyError with 1 or 2 for example.
|
|
- fakeuid = sys.maxsize
|
|
+ fakeuid = 2**32 - 2
|
|
self.assertNotIn(fakeuid, byuids)
|
|
if not support.is_android:
|
|
self.assertRaises(KeyError, pwd.getpwuid, fakeuid)
|