diff -r 1d72402c1c91 Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py Tue Mar 15 13:33:28 2016 +1300 +++ b/Lib/test/test_httpservers.py Tue Mar 22 16:45:33 2016 +0800 @@ -331,7 +331,7 @@ filename = os.fsdecode(support.TESTFN_UNDECODABLE) + '.txt' with open(os.path.join(self.tempdir, filename), 'wb') as f: f.write(support.TESTFN_UNDECODABLE) - response = self.request(self.tempdir_name + '/') + response = self.request('/' + self.tempdir_name + '/') if sys.platform == 'darwin': # On Mac OS the HFS+ filesystem replaces bytes that aren't valid # UTF-8 into a percent-encoded value. @@ -345,27 +345,27 @@ .encode(enc, 'surrogateescape'), body) self.assertIn(('>%s<' % html.escape(filename)) .encode(enc, 'surrogateescape'), body) - response = self.request(self.tempdir_name + '/' + quotedname) + response = self.request('/' + self.tempdir_name + '/' + quotedname) self.check_status_and_reason(response, HTTPStatus.OK, data=support.TESTFN_UNDECODABLE) def test_get(self): #constructs the path relative to the root directory of the HTTPServer - response = self.request(self.tempdir_name + '/test') + response = self.request('/' + self.tempdir_name + '/test') self.check_status_and_reason(response, HTTPStatus.OK, data=self.data) # check for trailing "/" which should return 404. See Issue17324 - response = self.request(self.tempdir_name + '/test/') + response = self.request('/' + self.tempdir_name + '/test/') self.check_status_and_reason(response, HTTPStatus.NOT_FOUND) - response = self.request(self.tempdir_name + '/') + response = self.request('/' + self.tempdir_name + '/') self.check_status_and_reason(response, HTTPStatus.OK) - response = self.request(self.tempdir_name) + response = self.request('/' + self.tempdir_name) self.check_status_and_reason(response, HTTPStatus.MOVED_PERMANENTLY) - response = self.request(self.tempdir_name + '/?hi=2') + response = self.request('/' + self.tempdir_name + '/?hi=2') self.check_status_and_reason(response, HTTPStatus.OK) - response = self.request(self.tempdir_name + '?hi=1') + response = self.request('/' + self.tempdir_name + '?hi=1') self.check_status_and_reason(response, HTTPStatus.MOVED_PERMANENTLY) self.assertEqual(response.getheader("Location"), - self.tempdir_name + "/?hi=1") + '/' + self.tempdir_name + "/?hi=1") response = self.request('/ThisDoesNotExist') self.check_status_and_reason(response, HTTPStatus.NOT_FOUND) response = self.request('/' + 'ThisDoesNotExist' + '/') @@ -382,14 +382,14 @@ if os.name == 'posix' and os.geteuid() != 0: os.chmod(self.tempdir, 0) try: - response = self.request(self.tempdir_name + '/') + response = self.request('/' + self.tempdir_name + '/') self.check_status_and_reason(response, HTTPStatus.NOT_FOUND) finally: os.chmod(self.tempdir, 0o755) def test_head(self): response = self.request( - self.tempdir_name + '/test', method='HEAD') + '/' + self.tempdir_name + '/test', method='HEAD') self.check_status_and_reason(response, HTTPStatus.OK) self.assertEqual(response.getheader('content-length'), str(len(self.data)))