From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 18 Sep 2015 14:24:31 +0000 (+0200)
Subject: Issue #25003: Skip test_os.URandomFDTests on Solaris 11.3 and newer
X-Git-Tag: v3.6.0a1~1520
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8f432a98c6bbe143002f45e181b7e5243d1166e;p=thirdparty%2FPython%2Fcpython.git

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 --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index b73b64ba1f0e..d4b9e9cc63b4 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1225,13 +1225,15 @@ class URandomTests(unittest.TestCase):
         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):