Merge branch 'master' into dbtests

[dak.git] / tests / dbtest_packages.py

diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index 6a0ff67c8b6b128b54842274d2d2303fbedb8570..32c1b8c5c72a9fb3428e32c289261e860e327115 100755 (executable)
--- a/tests/dbtest_packages.py
+++ b/tests/dbtest_packages.py
@@ -66,6 +66,8 @@ class PackageTestCase(DBDakTestCase):
         suites = get_architecture_suites('kfreebsd-i386', self.session)
         self.assertEqual(2, len(suites))
         self.assertTrue(self.suite['lenny'] not in suites)
+        # check overrides
+        self.assertEqual(0, self.suite['lenny'].overrides.count())
 
     def test_poolfiles(self):
         '''
@@ -107,6 +109,10 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual((True, self.file['sl_3.03-16.dsc']), \
             check_poolfile('main/s/sl/sl_3.03-16.dsc', 0, '', \
                 contrib.location_id, self.session))
+        # test string value of 2nd argument
+        self.assertEqual((True, self.file['sl_3.03-16.dsc']), \
+            check_poolfile('main/s/sl/sl_3.03-16.dsc', '0', '', \
+                contrib.location_id, self.session))
         self.assertEqual((False, None), \
             check_poolfile('foobar', 0, '', contrib.location_id, self.session))
         self.assertEqual((False, self.file['sl_3.03-16.dsc']), \
@@ -366,8 +372,9 @@ class PackageTestCase(DBDakTestCase):
     def test_components(self):
         'test class Component'
 
-        self.assertEqual(self.loc['main'], self.comp['main'].location)
-        self.assertEqual(self.loc['contrib'], self.comp['contrib'].location)
+        self.assertEqual([self.loc['main']], self.comp['main'].location)
+        self.assertEqual([self.loc['contrib']], self.comp['contrib'].location)
+        self.assertEqual(0, self.comp['main'].overrides.count())
 
     def test_get_component_by_package_suite(self):
         'test get_component_by_package_suite()'