From 0990305d2acc4c1b7869dae2773c1f24125804bd Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 25 Aug 2014 18:03:01 +0200
Subject: [generic] Fix rss under Python 2.x and move test to extractor

---
 test/helper.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'test/helper.py')

diff --git a/test/helper.py b/test/helper.py
index 22d763860..01b11f661 100644
--- 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)
-- 
cgit 1.4.1