From: Torsten Werner <twerner@debian.org>
Date: Sat, 26 Mar 2011 14:27:08 +0000 (+0100)
Subject: Fix DB tests.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=inline;h=4c02738f6c4961e603c8b4d2ac325e17eb1accee;hp=-c;p=dak.git

Fix DB tests.

Signed-off-by: Torsten Werner <twerner@debian.org>
---

4c02738f6c4961e603c8b4d2ac325e17eb1accee
diff --git a/tests/dbtest_contents.py b/tests/dbtest_contents.py
index 0f23053c..89b4bb71 100755
--- a/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@ -142,19 +142,13 @@ class ContentsTestCase(DBDakTestCase):
         self.setup_overrides()
         self.binary['hello_2.2-1_i386'].contents.append(BinContents(file = '/usr/bin/hello'))
         self.session.commit()
-        cw = BinaryContentsWriter(self.suite['squeeze'], self.arch['i386'], self.otype['deb'])
+        cw = BinaryContentsWriter(self.suite['squeeze'], self.arch['i386'], \
+            self.otype['deb'], self.comp['main'])
         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'))
-        # test output_filename
-        self.assertEqual('tests/fixtures/ftp/dists/squeeze/Contents-i386.gz', \
-            normpath(cw.output_filename()))
-        cw = BinaryContentsWriter(self.suite['squeeze'], self.arch['i386'], \
-            self.otype['udeb'], self.comp['main'])
-        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()