From: Torsten Werner <twerner@debian.org>
Date: Thu, 3 Mar 2011 22:49:50 +0000 (+0100)
Subject: Merge branch 'master' into dbtests
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d86fdc088f029bb7ebfd7b1e91a178f9efdc6650;p=dak.git

Merge branch 'master' into dbtests

Conflicts:
	tests/dbtest_contents.py
---

d86fdc088f029bb7ebfd7b1e91a178f9efdc6650
diff --cc tests/dbtest_contents.py
index 1cfe46b7,49db6848..b6512042
--- a/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@@ -154,8 -154,8 +154,10 @@@ 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):