X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Fdbtest_contents.py;h=158ec892d18f3cccaaa911ca37defd172783572f;hb=cd2fb635e33bd1214f73ab1ea9633808bba72f43;hp=7402601925178ddbfd1d3fa90796733461a7cabb;hpb=4bc88b4276c5b8cf2b03f24c81f19c90e8e12265;p=dak.git

diff --git a/tests/dbtest_contents.py b/tests/dbtest_contents.py
index 74026019..158ec892 100755
--- a/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@ -5,6 +5,7 @@ from db_test import DBDakTestCase
 from daklib.dbconn import *
 from daklib.contents import ContentsWriter, ContentsScanner
 
+from os.path import normpath
 from sqlalchemy.exc import FlushError, IntegrityError
 import unittest
 
@@ -140,20 +141,24 @@ 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()
@@ -161,8 +166,8 @@ class ContentsTestCase(DBDakTestCase):
         self.assertEqual(['usr/bin/hello', 'usr/share/doc/hello/copyright'],
             filelist)
         self.session.commit()
-        ContentsScanner(self.binary['hello_2.2-1_i386']).scan()
-        bin_contents_list = self.binary['hello_2.2-1_i386'].contents.all()
+        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)