diff options
| author | Jouke Waleson <jouke.waleson@mendix.com> | 2014-11-23 20:41:03 +0100 | 
|---|---|---|
| committer | Jouke Waleson <jouke.waleson@mendix.com> | 2014-11-23 20:41:03 +0100 | 
| commit | 5f6a1245ffa9276c1af59b0835afeef67e2fb5b1 (patch) | |
| tree | 139c6ede405cf3898e4639f0bf13d32d140fa5f1 /test/test_write_annotations.py | |
| parent | 598c218f7b5c3e78f98dad40f45646c0c9ec773e (diff) | |
PEP8 applied
Diffstat (limited to 'test/test_write_annotations.py')
| -rw-r--r-- | test/test_write_annotations.py | 26 | 
1 files changed, 12 insertions, 14 deletions
| diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py index eac53b285..852553ada 100644 --- a/test/test_write_annotations.py +++ b/test/test_write_annotations.py @@ -31,19 +31,18 @@ params = get_params({  }) -  TEST_ID = 'gr51aVj-mLg'  ANNOTATIONS_FILE = TEST_ID + '.flv.annotations.xml'  EXPECTED_ANNOTATIONS = ['Speech bubble', 'Note', 'Title', 'Spotlight', 'Label'] +  class TestAnnotations(unittest.TestCase):      def setUp(self):          # Clear old files          self.tearDown() -      def test_info_json(self): -        expected = list(EXPECTED_ANNOTATIONS) #Two annotations could have the same text. +        expected = list(EXPECTED_ANNOTATIONS)  # Two annotations could have the same text.          ie = youtube_dl.extractor.YoutubeIE()          ydl = YoutubeDL(params)          ydl.add_info_extractor(ie) @@ -51,7 +50,7 @@ class TestAnnotations(unittest.TestCase):          self.assertTrue(os.path.exists(ANNOTATIONS_FILE))          annoxml = None          with io.open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof: -                annoxml = xml.etree.ElementTree.parse(annof) +            annoxml = xml.etree.ElementTree.parse(annof)          self.assertTrue(annoxml is not None, 'Failed to parse annotations XML')          root = annoxml.getroot()          self.assertEqual(root.tag, 'document') @@ -59,18 +58,17 @@ class TestAnnotations(unittest.TestCase):          self.assertEqual(annotationsTag.tag, 'annotations')          annotations = annotationsTag.findall('annotation') -        #Not all the annotations have TEXT children and the annotations are returned unsorted. +        # Not all the annotations have TEXT children and the annotations are returned unsorted.          for a in annotations: -                self.assertEqual(a.tag, 'annotation') -                if a.get('type') == 'text': -                        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 -                        expected.remove(text) -        #We should have seen (and removed) all the expected annotation texts. +            self.assertEqual(a.tag, 'annotation') +            if a.get('type') == 'text': +                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 +                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.') -              def tearDown(self):          try_rm(ANNOTATIONS_FILE) | 
