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

2014-08-25 18:03:01 +02:00
parent 829476b80a
commit 0990305d2a
5 changed files with 31 additions and 12 deletions
--- 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)