From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 28 Oct 2014 13:16:28 +0000 (-0400)
Subject: Fix compatibility with just-released unittest2 0.6.
X-Git-Tag: v4.1.0b1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06638c8a5f9164c9567f26887c99bd592a10ec7d;p=thirdparty%2Ftornado.git

Fix compatibility with just-released unittest2 0.6.

This release added some PendingDeprecationWarnings that were
not there previously (and were DeprecationWarnings instead
in newer pythons)
---

diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
index a80b80b92..27cb18b1a 100644
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
@@ -92,6 +92,10 @@ def main():
     # 2.7 and 3.2
     warnings.filterwarnings("ignore", category=DeprecationWarning,
                             message="Please use assert.* instead")
+    # unittest2 0.6 on py26 reports these as PendingDeprecationWarnings
+    # instead of DeprecationWarnings.
+    warnings.filterwarnings("ignore", category=PendingDeprecationWarning,
+                            message="Please use assert.* instead")
 
     logging.getLogger("tornado.access").setLevel(logging.CRITICAL)