summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorYen Chi Hsuan <[email protected]>2015-12-19 18:21:42 +0800
committerYen Chi Hsuan <[email protected]>2015-12-19 18:21:42 +0800
commitd631d5f9f27f93767226192e4288990413fa9dbd (patch)
tree055755c210c91b43d2491087764560c2f9c0ab39 /test
parent4f29fa99069760dc47ef9ca5dbf607a567d2982f (diff)
downloadyoutube-dl-d631d5f9f27f93767226192e4288990413fa9dbd.tar.gz
youtube-dl-d631d5f9f27f93767226192e4288990413fa9dbd.zip
[utils] Fix TTML conversion
Tolerate invalid timestamps (closes #7909)
Diffstat (limited to 'test')
-rw-r--r--test/test_utils.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py
index 8fc74e591..86045e680 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -661,8 +661,8 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4')
{'like_count': 190, 'dislike_count': 10}))
def test_parse_dfxp_time_expr(self):
- self.assertEqual(parse_dfxp_time_expr(None), 0.0)
- self.assertEqual(parse_dfxp_time_expr(''), 0.0)
+ self.assertEqual(parse_dfxp_time_expr(None), None)
+ self.assertEqual(parse_dfxp_time_expr(''), None)
self.assertEqual(parse_dfxp_time_expr('0.1'), 0.1)
self.assertEqual(parse_dfxp_time_expr('0.1s'), 0.1)
self.assertEqual(parse_dfxp_time_expr('00:00:01'), 1.0)
@@ -676,6 +676,9 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4')
<p begin="0" end="1">The following line contains Chinese characters and special symbols</p>
<p begin="1" end="2">第二行<br/>♪♪</p>
<p begin="2" dur="1"><span>Third<br/>Line</span></p>
+ <p begin="3" end="-1">Lines with invalid timestamps are ignored</p>
+ <p begin="-1" end="-1">Ignore, two</p>
+ <p begin="3" dur="-1">Ignored, three</p>
</div>
</body>
</tt>'''