From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 19 Sep 2010 03:09:54 +0000 (+0000)
Subject: Update the test_distutils mode test to test with umask value properly.
X-Git-Tag: v3.2a3~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cc9a052c10662173677900b4ed010074716bc0a;p=thirdparty%2FPython%2Fcpython.git

Update the test_distutils mode test to test with umask value properly.
---

diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index 892a66d2adf9..a1647fbcf539 100644
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -53,10 +53,15 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
     @unittest.skipIf(sys.platform.startswith('win'),
                         "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
+        # Get and set the current umask value for testing mode bits.
+        umask = os.umask(0o002)
+        os.umask(umask)
         mkpath(self.target, 0o700)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target).st_mode), 0o700 & ~umask)
         mkpath(self.target2, 0o555)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target2).st_mode), 0o555 & ~umask)
 
     def test_create_tree_verbosity(self):