Merge branch 'universal' into edumed-ofop

[librarian.git] / tests / test_picture.py

diff --git a/tests/test_picture.py b/tests/test_picture.py
index 35f2cf9..f64f624 100644 (file)
--- a/tests/test_picture.py
+++ b/tests/test_picture.py
@@ -31,7 +31,7 @@ def test_wlpicture():
 
     #    from nose.tools import set_trace; set_trace()
     assert pi.type[0] == u"Image"
 
     #    from nose.tools import set_trace; set_trace()
     assert pi.type[0] == u"Image"

-    assert pi.mime_type == u'image/png' == wlp.mime_type
+    assert pi.mime_type == u'image/jpeg' == wlp.mime_type

     assert wlp.slug == 'angelus-novus'
 
     assert path.exists(wlp.image_path)
     assert wlp.slug == 'angelus-novus'
 
     assert path.exists(wlp.image_path)


@@ -45,9 +45,10 @@ def test_picture_parts():
     assert len(parts) == 5, "there should be %d parts of the picture" % 5
     motifs = set()
     names = set()
     assert len(parts) == 5, "there should be %d parts of the picture" % 5
     motifs = set()
     names = set()

-    
+
+    print parts

     for p in parts:
     for p in parts:

-        for m in p['motifs']:
+        for m in p['themes']:

             motifs.add(m)
     for p in parts:
         if p['object']:
             motifs.add(m)
     for p in parts:
         if p['object']: