[generic] Fix rss under Python 2.x and move test to extractor

[youtube-dl.git] / test / helper.py

diff --git a/test/helper.py b/test/helper.py
index 22d7638606841bc0250665402e09fb49655e5d89..01b11f6612dae53ae08bf397db89182c92ae4666 100644 (file)
--- a/test/helper.py
+++ b/test/helper.py
@@ -102,7 +102,10 @@ def expect_info_dict(self, expected_dict, got_dict):
             match_rex = re.compile(match_str)
 
             self.assertTrue(
-                isinstance(got, compat_str) and match_rex.match(got),
+                isinstance(got, compat_str),
+                'Expected a %r object, but got %r' % (compat_str, type(got)))
+            self.assertTrue(
+                match_rex.match(got),
                 u'field %s (value: %r) should match %r' % (info_field, got, match_str))
         elif isinstance(expected, type):
             got = got_dict.get(info_field)