Metadata: add cascading to mapper configuration.

[dak.git] / tests / dbtest_contents.py

diff --git a/tests/dbtest_contents.py b/tests/dbtest_contents.py
index 43cf838cace46628e59c32872dfca1b36834b533..158ec892d18f3cccaaa911ca37defd172783572f 100755 (executable)
--- a/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@ -145,9 +145,7 @@ class ContentsTestCase(DBDakTestCase):
             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']))
+            cw.formatline('/usr/bin/hello', 'python/hello'))
         # test output_filename
         self.assertEqual('tests/fixtures/ftp/dists/squeeze/Contents-i386.gz', \
             normpath(cw.output_filename()))
@@ -168,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)