Bug 1258003 - Raise ValueError if video_urls empty; r?maja_zf
MozReview-Commit-ID: 6YP65VWfGRA
--- a/dom/media/test/external/external_media_harness/runtests.py
+++ b/dom/media/test/external/external_media_harness/runtests.py
@@ -22,25 +22,27 @@ class MediaTestArgumentsBase(object):
[['--urls'], {
'help': 'ini file of urls to make available to all tests',
'default': os.path.join(external_media_tests.urls, 'default.ini'),
}],
]
def verify_usage_handler(self, args):
if args.urls:
- if not os.path.isfile(args.urls):
- raise ValueError('--urls must provide a path to an ini file')
- else:
- path = os.path.abspath(args.urls)
- args.video_urls = MediaTestArgumentsBase.get_urls(path)
+ if not os.path.isfile(args.urls):
+ raise ValueError('--urls must provide a path to an ini file')
+ else:
+ path = os.path.abspath(args.urls)
+ args.video_urls = MediaTestArgumentsBase.get_urls(path)
+ if not args.video_urls:
+ raise ValueError('list of video URLs cannot be empty')
def parse_args_handler(self, args):
if not args.tests:
- args.tests = [external_media_tests.manifest]
+ args.tests = [external_media_tests.manifest]
@staticmethod
def get_urls(manifest):
with open(manifest, 'r'):
return [line[0] for line in read_ini(manifest)]