summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-18 19:58:41 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-18 19:58:41 +0100
commit9789d7535d6091f64dd688b0bb1f9869b6c6ca49 (patch)
tree3ad0382e2e8a8122d0a4aa740ae8f0f058227cd6
parentd8443cd3f7e50fafb918cff5e1676b8d6fef1a64 (diff)
downloadyoutube-dl-9789d7535d6091f64dd688b0bb1f9869b6c6ca49.tar.gz
youtube-dl-9789d7535d6091f64dd688b0bb1f9869b6c6ca49.tar.xz
youtube-dl-9789d7535d6091f64dd688b0bb1f9869b6c6ca49.zip
[xtube] Fix test case
-rw-r--r--test/helper.py10
-rw-r--r--youtube_dl/extractor/xtube.py2
2 files changed, 11 insertions, 1 deletions
diff --git a/test/helper.py b/test/helper.py
index 570c91440..12afdf184 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -113,6 +113,16 @@ def expect_info_dict(self, got_dict, expected_dict):
             self.assertTrue(
                 got.startswith(start_str),
                 'field %s (value: %r) should start with %r' % (info_field, got, start_str))
+        elif isinstance(expected, compat_str) and expected.startswith('contains:'):
+            got = got_dict.get(info_field)
+            contains_str = expected[len('contains:'):]
+            self.assertTrue(
+                isinstance(got, compat_str),
+                'Expected a %s object, but got %s for field %s' % (
+                    compat_str.__name__, type(got).__name__, info_field))
+            self.assertTrue(
+                contains_str in got,
+                'field %s (value: %r) should contain %r' % (info_field, got, contains_str))
         elif isinstance(expected, type):
             got = got_dict.get(info_field)
             self.assertTrue(isinstance(got, expected),
diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py
index e8490b028..1644f53c8 100644
--- a/youtube_dl/extractor/xtube.py
+++ b/youtube_dl/extractor/xtube.py
@@ -22,7 +22,7 @@ class XTubeIE(InfoExtractor):
             'id': 'kVTUy_G222_',
             'ext': 'mp4',
             'title': 'strange erotica',
-            'description': 'http://www.xtube.com an ET kind of thing',
+            'description': 'contains:an ET kind of thing',
             'uploader': 'greenshowers',
             'duration': 450,
             'age_limit': 18,