X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Fdbtest_contents.py;h=158ec892d18f3cccaaa911ca37defd172783572f;hb=d7b90c4606e6f4fe32965d3c77d8f5f7428b7168;hp=575facdd5dc9b4f29d86e6af657d6041404f29a5;hpb=0d651b1c6eefaabfe8be90355ea181a5e275bd9d;p=dak.git

diff --git a/tests/dbtest_contents.py b/tests/dbtest_contents.py
index 575facdd..158ec892 100755
--- a/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@ -3,8 +3,9 @@
 from db_test import DBDakTestCase
 
 from daklib.dbconn import *
-from daklib.contents import ContentsWriter
+from daklib.contents import ContentsWriter, ContentsScanner
 
+from os.path import normpath
 from sqlalchemy.exc import FlushError, IntegrityError
 import unittest
 
@@ -140,26 +141,36 @@ class ContentsTestCase(DBDakTestCase):
         self.binary['hello_2.2-1_i386'].contents.append(BinContents(file = '/usr/bin/hello'))
         self.session.commit()
         cw = ContentsWriter(self.suite['squeeze'], self.arch['i386'], self.otype['deb'])
-        self.assertEqual(['/usr/bin/hello                                              python/hello\n'], \
+        self.assertEqual(['/usr/bin/hello                                          python/hello\n'], \
             cw.get_list())
         # test formatline and sort order
-        self.assertEqual('/usr/bin/hello                                              python/hello\n', \
-            cw.formatline('/usr/bin/hello', ['python/hello']))
-        self.assertEqual('/usr/bin/hello                                              editors/emacs,python/hello,utils/sl\n', \
-            cw.formatline('/usr/bin/hello', ['editors/emacs', 'python/hello', 'utils/sl']))
+        self.assertEqual('/usr/bin/hello                                          python/hello\n', \
+            cw.formatline('/usr/bin/hello', 'python/hello'))
         # test output_filename
-        self.assertEqual('tests/fixtures/ftp/squeeze/Contents-i386.gz', \
-            cw.output_filename())
+        self.assertEqual('tests/fixtures/ftp/dists/squeeze/Contents-i386.gz', \
+            normpath(cw.output_filename()))
         cw = ContentsWriter(self.suite['squeeze'], self.arch['i386'], \
             self.otype['udeb'], self.comp['main'])
-        self.assertEqual('tests/fixtures/ftp/squeeze/main/Contents-i386.gz', \
-            cw.output_filename())
+        self.assertEqual('tests/fixtures/ftp/dists/squeeze/main/Contents-i386.gz', \
+            normpath(cw.output_filename()))
+        # test unicode support
+        self.binary['hello_2.2-1_i386'].contents.append(BinContents(file = '\xc3\xb6'))
+        self.session.commit()
+        # test delete cascading
+        self.session.delete(self.binary['hello_2.2-1_i386'])
+        self.session.commit()
 
     def test_scan_contents(self):
         self.setup_binaries()
         filelist = [f for f in self.binary['hello_2.2-1_i386'].scan_contents()]
         self.assertEqual(['usr/bin/hello', 'usr/share/doc/hello/copyright'],
             filelist)
+        self.session.commit()
+        ContentsScanner(self.binary['hello_2.2-1_i386'].binary_id).scan()
+        bin_contents_list = self.binary['hello_2.2-1_i386'].contents.order_by('file').all()
+        self.assertEqual(2, len(bin_contents_list))
+        self.assertEqual('usr/bin/hello', bin_contents_list[0].file)
+        self.assertEqual('usr/share/doc/hello/copyright', bin_contents_list[1].file)
 
     def classes_to_clean(self):
         return [Override, Suite, BinContents, DBBinary, DBSource, Architecture, Section, \