Merge e7a9f4d into 565b6ff

jfinkels · Aug 15, 2016 · 251ea42 · 251ea42
2 parents 565b6ff + e7a9f4d
commit 251ea42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -23,3 +23,11 @@
 ``python setup.py test``).
 
 """
+import sys
+import warnings
+
+# Convert Python warnings into errors on tests, but only if Python
+# version 2.7 or greater; on Python 2.6, unittest2 gives a
+# RuntimeWarning when trying to skip a test.
+if sys.version_info >= (2, 7):
+    warnings.simplefilter('error')
diff --git a/tests/test_filtering.py b/tests/test_filtering.py
@@ -949,7 +949,7 @@ def test_to_many_filter_by_relation(self):
         self.session.add(article)
         for i in range(1, 3):
             comment = self.Comment(id=i)
-            tag = self.Tag(name=str(i))
+            tag = self.Tag(name=u'{0}'.format(i))
             comment.article = article
             comment.tag = tag
             self.session.add_all([comment, tag])