changeset:   98055:221e09b89186
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Fri Sep 18 16:24:31 2015 +0200
files:       Lib/test/test_os.py
description:
Issue #25003: Skip test_os.URandomFDTests on Solaris 11.3 and newer

When os.urandom() is implemented with the getrandom() function, it doesn't use
a file descriptor.


diff -r 8b0c2c7cb4a7 -r 221e09b89186 Lib/test/test_os.py
--- a/Lib/test/test_os.py	Fri Sep 18 15:38:37 2015 +0200
+++ b/Lib/test/test_os.py	Fri Sep 18 16:24:31 2015 +0200
@@ -1225,13 +1225,15 @@
         self.assertNotEqual(data1, data2)
 
 
-HAVE_GETENTROPY = (sysconfig.get_config_var('HAVE_GETENTROPY') == 1)
-HAVE_GETRANDOM = (sysconfig.get_config_var('HAVE_GETRANDOM_SYSCALL') == 1)
-
-@unittest.skipIf(HAVE_GETENTROPY,
-                 "getentropy() does not use a file descriptor")
-@unittest.skipIf(HAVE_GETRANDOM,
-                 "getrandom() does not use a file descriptor")
+# os.urandom() doesn't use a file descriptor when it is implemented with the
+# getentropy() function, the getrandom() function or the getrandom() syscall
+OS_URANDOM_DONT_USE_FD = (
+    sysconfig.get_config_var('HAVE_GETENTROPY') == 1
+    or sysconfig.get_config_var('HAVE_GETRANDOM') == 1
+    or sysconfig.get_config_var('HAVE_GETRANDOM_SYSCALL') == 1)
+
+@unittest.skipIf(OS_URANDOM_DONT_USE_FD ,
+                 "os.random() does not use a file descriptor")
 class URandomFDTests(unittest.TestCase):
     @unittest.skipUnless(resource, "test requires the resource module")
     def test_urandom_failure(self):