From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 24 Oct 2015 13:57:16 +0000 (-0400)
Subject: Make test_root_static_path more robust.
X-Git-Tag: v4.3.0b2~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc5657c40c15e7689409544428efef5f65f4328e;p=thirdparty%2Ftornado.git

Make test_root_static_path more robust.

Always convert `__file__` to an absolute path (this is already
guaranteed in Python 3.4+, but in older versions it would sometimes be
relative). Encode the path so the test can pass when run from a
directory containing spaces or other special characters.

Fixes #1565
---

diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
index fe7e4c1bf..a734a40e3 100644
--- a/tornado/test/web_test.py
+++ b/tornado/test/web_test.py
@@ -1218,8 +1218,9 @@ class StaticFileTest(WebTestCase):
         # to disable Tornado's path validation (in conjunction with
         # their own validation in get_absolute_path). Make sure
         # that the stricter validation in 4.2.1 doesn't break them.
-        path = os.path.join(os.path.dirname(__file__), 'static/robots.txt')
-        response = self.get_and_head('/root_static' + path)
+        path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                            'static/robots.txt')
+        response = self.get_and_head('/root_static' + urllib_parse.quote(path))
         self.assertEqual(response.code, 200)