]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Fix compatibility with just-released unittest2 0.6.
authorBen Darnell <ben@bendarnell.com>
Tue, 28 Oct 2014 13:16:28 +0000 (09:16 -0400)
committerBen Darnell <ben@bendarnell.com>
Tue, 28 Oct 2014 13:16:28 +0000 (09:16 -0400)
This release added some PendingDeprecationWarnings that were
not there previously (and were DeprecationWarnings instead
in newer pythons)

tornado/test/runtests.py

index a80b80b9268017af0d4c6f2963c8e55500528fa6..27cb18b1a23be8cf2274f7af4de03bdda2430251 100644 (file)
@@ -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)