From: Charles-François Natali <neologix@free.fr>
Date: Wed, 2 Nov 2011 18:35:14 +0000 (+0100)
Subject: Issue #13308: Fix test_httpservers failures when run as root.
X-Git-Tag: v3.2.3rc1~436
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7ed9fc063cc4c11cfdf36b6c5023b984ed36b26;p=thirdparty%2FPython%2Fcpython.git

Issue #13308: Fix test_httpservers failures when run as root.
---

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 39ebc263381f..e83c048ed940 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -259,8 +259,9 @@ class SimpleHTTPServerTestCase(BaseTestCase):
         with open(os.path.join(self.tempdir_name, 'index.html'), 'w') as f:
             response = self.request('/' + self.tempdir_name + '/')
             self.check_status_and_reason(response, 200)
-            if os.name == 'posix':
-                # chmod won't work as expected on Windows platforms
+            # chmod() doesn't work as expected on Windows, and filesystem
+            # permissions are ignored by root on Unix.
+            if os.name == 'posix' and os.geteuid() != 0:
                 os.chmod(self.tempdir, 0)
                 response = self.request(self.tempdir_name + '/')
                 self.check_status_and_reason(response, 404)
@@ -305,6 +306,9 @@ print("%%s, %%s, %%s" %% (form.getfirst("spam"), form.getfirst("eggs"),
                           form.getfirst("bacon")))
 """
 
+
+@unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
+        "This test can't be run reliably as root (issue #13308).")
 class CGIHTTPServerTestCase(BaseTestCase):
     class request_handler(NoLogRequestHandler, CGIHTTPRequestHandler):
         pass