浏览代码

[abcnews] Improve and remove duplicate test (closes #12851)

Sergey M․ 8 年之前
父节点
当前提交
164fcbfeb7
共有 1 个文件被更改,包括 9 次插入13 次删除
  1. 9 13
      youtube_dl/extractor/abcnews.py

+ 9 - 13
youtube_dl/extractor/abcnews.py

@@ -13,10 +13,14 @@ from ..compat import compat_urlparse
 class AbcNewsVideoIE(AMPIE):
 class AbcNewsVideoIE(AMPIE):
     IE_NAME = 'abcnews:video'
     IE_NAME = 'abcnews:video'
     _VALID_URL = r'''(?x)
     _VALID_URL = r'''(?x)
-        https?://abcnews\.go\.com/
-            (?:[^/]+/video/(?P<display_id>[0-9a-z-]+)-|
-               video/embed\?id=)
-       (?P<id>\d+)'''
+                    https?://
+                        abcnews\.go\.com/
+                        (?:
+                            [^/]+/video/(?P<display_id>[0-9a-z-]+)-|
+                            video/embed\?.*?\bid=
+                        )
+                        (?P<id>\d+)
+                    '''
 
 
     _TESTS = [{
     _TESTS = [{
         'url': 'http://abcnews.go.com/ThisWeek/video/week-exclusive-irans-foreign-minister-zarif-20411932',
         'url': 'http://abcnews.go.com/ThisWeek/video/week-exclusive-irans-foreign-minister-zarif-20411932',
@@ -35,15 +39,7 @@ class AbcNewsVideoIE(AMPIE):
         },
         },
     }, {
     }, {
         'url': 'http://abcnews.go.com/video/embed?id=46979033',
         'url': 'http://abcnews.go.com/video/embed?id=46979033',
-        'md5': 'd19d160cfa8372fc197f406d4821dd9f',
-        'info_dict': {
-            'id': '46979033',
-            'ext': 'flv',
-            'title': 'Nikki Haley reacts to French election results',
-            'description': 'md5:df1b5ad1b8ad76c4d4e01d3c67d6b38e',
-            'duration': 274,
-            'thumbnail': r're:^https?://.*\.jpg$',
-        },
+        'only_matching': True,
     }, {
     }, {
         'url': 'http://abcnews.go.com/2020/video/2020-husband-stands-teacher-jail-student-affairs-26119478',
         'url': 'http://abcnews.go.com/2020/video/2020-husband-stands-teacher-jail-student-affairs-26119478',
         'only_matching': True,
         'only_matching': True,