Merge branch 'master' into dbtests

[dak.git] / tests / dbtest_contents.py

diff --git a/tests/dbtest_contents.py b/tests/dbtest_contents.py
index 575facdd5dc9b4f29d86e6af657d6041404f29a5..b651204216345d681f7c0548eb15c37001d73250 100755 (executable)
--- a/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@ -3,7 +3,7 @@
 from db_test import DBDakTestCase
 
 from daklib.dbconn import *
-from daklib.contents import ContentsWriter
+from daklib.contents import ContentsWriter, ContentsScanner
 
 from sqlalchemy.exc import FlushError, IntegrityError
 import unittest
@@ -154,12 +154,23 @@ class ContentsTestCase(DBDakTestCase):
             self.otype['udeb'], self.comp['main'])
         self.assertEqual('tests/fixtures/ftp/squeeze/main/Contents-i386.gz', \
             cw.output_filename())
+        # test delete cascading
+        self.session.delete(self.binary['hello_2.2-1_i386'])
+        # test unicode support
+        self.binary['hello_2.2-1_i386'].contents.append(BinContents(file = '\xc3\xb6'))
+        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']).scan()
+        bin_contents_list = self.binary['hello_2.2-1_i386'].contents.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, \