# HG changeset patch
# Parent 53e94a6875704104f9be0c9589754fb16788b621
SimpleHTTPRequestHandler should return index.html, not directory

diff -r 53e94a687570 Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py	Tue Jan 27 11:10:18 2015 -0500
+++ b/Lib/test/test_httpservers.py	Sun Feb 01 09:07:34 2015 +0000
@@ -261,12 +261,23 @@
             BaseTestCase.tearDown(self)
 
     def check_status_and_reason(self, response, status, data=None):
+        def close_conn():
+            """Don't close reader yet so we can check if there was leftover
+            buffered input"""
+            nonlocal reader
+            reader = response.fp
+            response.fp = None
+        reader = None
+        response._close_conn = close_conn
+
         body = response.read()
         self.assertTrue(response)
         self.assertEqual(response.status, status)
         self.assertIsNotNone(response.reason)
         if data:
             self.assertEqual(data, body)
+        self.assertEqual(reader.read(30), b'', 'Connection should be closed')
+        reader.close()
         return body
 
     @support.requires_mac_ver(10, 5)
@@ -316,16 +327,20 @@
         self.check_status_and_reason(response, 404)
         response = self.request('/' + 'ThisDoesNotExist' + '/')
         self.check_status_and_reason(response, 404)
-        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)
-            # 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)
-                os.chmod(self.tempdir, 0o755)
+
+        data = b"Dummy index file\r\n"
+        with open(os.path.join(self.tempdir_name, 'index.html'), 'wb') as f:
+            f.write(data)
+        response = self.request('/' + self.tempdir_name + '/')
+        self.check_status_and_reason(response, 200, data)
+
+        # 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)
+            os.chmod(self.tempdir, 0o755)
 
     def test_head(self):
         response = self.request(