X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/6bcd99d1af4e97428d441a3e9c37846370020293..7f4607810640a9e562f06df4f1b8ec6fee8b0eea:/apps/catalogue/tests/__init__.py

diff --git a/apps/catalogue/tests/__init__.py b/apps/catalogue/tests/__init__.py
index 91c3f812..3421d333 100755
--- a/apps/catalogue/tests/__init__.py
+++ b/apps/catalogue/tests/__init__.py
@@ -118,7 +118,7 @@ class GalleryAppendTests(TestCase):
         c.gallery_start = 0
         c = self.book2[1]
         c.gallery_start = 2
-        import nose.tools; nose.tools.set_trace()
+
         self.make_gallery(self.book1, {
             '1-0001_1l' : 'aa',
             '1-0001_2r' : 'bb',
@@ -127,7 +127,7 @@ class GalleryAppendTests(TestCase):
             })
 
         self.make_gallery(self.book2, {
-            '1-0001_1l' : 'ee',
+            '1-0001_1l' : 'dd', # the same, should not be moved
             '1-0001_2r' : 'ff',
             '2-0002_1l' : 'gg',
             '2-0002_2r' : 'hh',
@@ -136,18 +136,19 @@ class GalleryAppendTests(TestCase):
         self.book1.append(self.book2)
 
         files = listdir(join(self.scandir, self.book1.gallery))
+        files.sort()
         self.assertEqual(files, [
             '1-0001_1l',
             '1-0001_2r',
             '1-0002_1l',
             '1-0002_2r',
-            '2-0001_1l',
+            #            '2-0001_1l',
             '2-0001_2r',
             '3-0002_1l',
             '3-0002_2r',
             ])        
 
-        self.assertEqual((4, 6), (self.book1[2].gallery_start, self.book1[3].gallery_start))
+        self.assertEqual((3, 5), (self.book1[2].gallery_start, self.book1[3].gallery_start))
         
         
     def test_none_indexed(self):
@@ -169,6 +170,7 @@ class GalleryAppendTests(TestCase):
         self.book1.append(self.book2)
 
         files = listdir(join(self.scandir, self.book1.gallery))
+        files.sort()
         print files
         self.assertEqual(files, [
             '0-0001_1l',
@@ -183,6 +185,7 @@ class GalleryAppendTests(TestCase):
 
 
     def test_none_indexed(self):
+        import nose.tools
         self.book2 = Book.create(self.user, 'book 2', slug='book2')
         self.make_gallery(self.book1, {
             '1-0001_1l' : 'aa',
@@ -201,6 +204,7 @@ class GalleryAppendTests(TestCase):
         self.book1.append(self.book2)
 
         files = listdir(join(self.scandir, self.book1.gallery))
+        files.sort()
         print files
         self.assertEqual(files, [
             '0-1-0001_1l',