X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..5105e426102784140df92c6a6ce1ffdf70866a4e:/src/picture/tests/picture_import.py diff --git a/src/picture/tests/picture_import.py b/src/picture/tests/picture_import.py index 1e17289c3..022b33c62 100644 --- a/src/picture/tests/picture_import.py +++ b/src/picture/tests/picture_import.py @@ -16,9 +16,10 @@ class PictureTest(WLTestCase): themes = set() for area in picture.areas.all(): - themes.update([(tag.category, tag.name) + themes.update([ + (tag.category, tag.name) for tag in area.tags if tag.category in (u'theme', u'thing')]) - assert themes == set([(u'theme', u'nieporządek'), (u'thing', u'Kosmos')]), \ + assert themes == {(u'theme', u'nieporządek'), (u'thing', u'Kosmos')}, \ 'Bad themes on Picture areas: %s' % themes pic_themes = set([tag.name for tag in picture.tags if tag.category in ('theme', 'thing')]) @@ -32,7 +33,6 @@ class PictureTest(WLTestCase): picture.delete() - def test_import_2(self): picture = Picture.from_xml_file(path.join(path.dirname(__file__), "files/kandinsky-composition-viii.xml"), path.join(path.dirname(__file__), "files/kandinsky-composition-viii.png"), @@ -40,4 +40,3 @@ class PictureTest(WLTestCase): cats = set([t.category for t in picture.tags]) assert 'epoch' in cats assert 'kind' in cats -