From: Guido van Rossum <guido@python.org>
Date: Wed, 31 Mar 2004 18:55:17 +0000 (+0000)
Subject: Backport 1.17:
X-Git-Tag: v2.3.4c1~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58eddb17a6e8d09862c101ea13aad5933784063e;p=thirdparty%2FPython%2Fcpython.git

Backport 1.17:
When /tmp has certain sticky bits set, newly created subdirectories
inherit those bits, causing the test_mkdtemp.test_mode() test to fail.
Remove those before comparing the actual mode to the expected mode.
---

diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 62127d8c3fb7..270587ed4044 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -473,6 +473,7 @@ class test_mkdtemp(TC):
         dir = self.do_create()
         try:
             mode = stat.S_IMODE(os.stat(dir).st_mode)
+            mode &= 0777 # Mask off sticky bits inherited from /tmp
             expected = 0700
             if sys.platform in ('win32', 'os2emx', 'mac'):
                 # There's no distinction among 'user', 'group' and 'world';