X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Fdbtest_contents.py;h=89b4bb71593790d28c7cfeb7765b9226d853e99d;hb=7c5adcf962fe99d6a42307595f263f47d0112fbc;hp=0f23053c3fe3d412191d48413352f8137be2594e;hpb=886522194878afe478e4dd61397493f35b5b0e5d;p=dak.git

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()