From: R. David Murray <rdmurray@bitdance.com>
Date: Thu, 9 Jul 2009 13:55:44 +0000 (+0000)
Subject: Specify umask in execute bit test to get consistent results
X-Git-Tag: v2.7a1~812
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbf2cc4d7467a489ef8948f7461c9f30c900eee5;p=thirdparty%2FPython%2Fcpython.git

Specify umask in execute bit test to get consistent results
and make sure we test resetting all three execute bits.
---

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index 0c4fd87ac8e1..64cc3141e755 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -97,6 +97,7 @@ class ImportTest(unittest.TestCase):
     def test_execute_bit_not_copied(self):
         # Issue 6070: under posix .pyc files got their execute bit set if
         # the .py file had the execute bit set, but they aren't executable.
+        oldmask = os.umask(022)
         try:
             fname = TESTFN + os.extsep + "py"
             f = open(fname, 'w').close()
@@ -112,6 +113,7 @@ class ImportTest(unittest.TestCase):
             self.assertEquals(stat.S_IMODE(s.st_mode),
                               stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
         finally:
+            os.umask(oldmask)
             remove_files(TESTFN)
             if TESTFN in sys.modules: del sys.modules[TESTFN]