Turn short and hex XSRF tests into success tests

diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
index 2f595af673d29d0fa7c8a5ff469cd38363d0206b..0ac3b10478ddde1932c0d2787a039c5164b8bdab 100644 (file)
--- a/tornado/test/web_test.py
+++ b/tornado/test/web_test.py
@@ -1954,20 +1954,6 @@ class XSRFTest(SimpleHandlerTestCase):
                 body=urllib_parse.urlencode(dict(_xsrf=self.xsrf_token)))
         self.assertEqual(response.code, 403)
 
-    def test_xsrf_success_short_token(self):
-        with ExpectLog(gen_log, ".*XSRF cookie does not match POST"):
-            response = self.fetch(
-                "/", method="POST",
-                body=urllib_parse.urlencode(dict(_xsrf='deadbeef')))
-        self.assertEqual(response.code, 403)
-
-    def test_xsrf_success_non_hex_token(self):
-        with ExpectLog(gen_log, ".*XSRF cookie is not a hexadecimal"):
-            response = self.fetch(
-                "/", method="POST",
-                body=urllib_parse.urlencode(dict(_xsrf='xoxo')))
-        self.assertEqual(response.code, 400)
-
     def test_xsrf_fail_cookie_no_body(self):
         with ExpectLog(gen_log, ".*'_xsrf' argument missing"):
             response = self.fetch(
@@ -1975,6 +1961,20 @@ class XSRFTest(SimpleHandlerTestCase):
                 headers=self.cookie_headers())
         self.assertEqual(response.code, 403)
 
+    def test_xsrf_success_short_token(self):
+        response = self.fetch(
+            "/", method="POST",
+            body=urllib_parse.urlencode(dict(_xsrf='deadbeef')),
+            headers=self.cookie_headers(token='deadbeef'))
+        self.assertEqual(response.code, 200)
+
+    def test_xsrf_success_non_hex_token(self):
+        response = self.fetch(
+            "/", method="POST",
+            body=urllib_parse.urlencode(dict(_xsrf='xoxo')),
+            headers=self.cookie_headers(token='xoxo'))
+        self.assertEqual(response.code, 200)
+
     def test_xsrf_success_post_body(self):
         response = self.fetch(
             "/", method="POST",