debian/control: Rerun wrap-and-sort.

[youtubedl] / test / test_write_annotations.py

diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py
index 780636c7730d396c381fd45fd6d4e8126d1c9fe2..41abdfe3b99eaabf562ebabc222fc50fead77631 100644 (file)
--- a/test/test_write_annotations.py
+++ b/test/test_write_annotations.py
@@ -24,6 +24,7 @@ class YoutubeDL(youtube_dl.YoutubeDL):
         super(YoutubeDL, self).__init__(*args, **kwargs)
         self.to_stderr = self.to_screen
 
         super(YoutubeDL, self).__init__(*args, **kwargs)
         self.to_stderr = self.to_screen
 

+

 params = get_params({
     'writeannotations': True,
     'skip_download': True,
 params = get_params({
     'writeannotations': True,
     'skip_download': True,


@@ -33,7 +34,7 @@ params = get_params({
 
 
 TEST_ID = 'gr51aVj-mLg'
 
 
 TEST_ID = 'gr51aVj-mLg'

-ANNOTATIONS_FILE = TEST_ID + '.flv.annotations.xml'
+ANNOTATIONS_FILE = TEST_ID + '.annotations.xml'

 EXPECTED_ANNOTATIONS = ['Speech bubble', 'Note', 'Title', 'Spotlight', 'Label']
 
 
 EXPECTED_ANNOTATIONS = ['Speech bubble', 'Note', 'Title', 'Spotlight', 'Label']
 
 


@@ -66,7 +67,7 @@ class TestAnnotations(unittest.TestCase):
                 textTag = a.find('TEXT')
                 text = textTag.text
                 self.assertTrue(text in expected)  # assertIn only added in python 2.7
                 textTag = a.find('TEXT')
                 text = textTag.text
                 self.assertTrue(text in expected)  # assertIn only added in python 2.7

-                # remove the first occurance, there could be more than one annotation with the same text
+                # remove the first occurrence, there could be more than one annotation with the same text

                 expected.remove(text)
         # We should have seen (and removed) all the expected annotation texts.
         self.assertEqual(len(expected), 0, 'Not all expected annotations were found.')
                 expected.remove(text)
         # We should have seen (and removed) all the expected annotation texts.
         self.assertEqual(len(expected), 0, 'Not all expected annotations were found.')


@@ -74,5 +75,6 @@ class TestAnnotations(unittest.TestCase):
     def tearDown(self):
         try_rm(ANNOTATIONS_FILE)
 
     def tearDown(self):
         try_rm(ANNOTATIONS_FILE)
 

+

 if __name__ == '__main__':
     unittest.main()
 if __name__ == '__main__':
     unittest.main()