X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Fdbtest_packages.py;h=f4749aca0c8f7a4396ff985568961d4ca97323f8;hb=48dc11caafef8b296d2b7d781e2b23b12364abcb;hp=12ab5960ded9a9795604a6d84746d86f64f0b67d;hpb=221c511735a22974ac5ee9e1d2d5d52bf29e263e;p=dak.git diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py index 12ab5960..f4749aca 100755 --- a/tests/dbtest_packages.py +++ b/tests/dbtest_packages.py @@ -6,7 +6,8 @@ from daklib.dbconn import Architecture, Suite, get_suite_architectures, \ get_architecture_suites, Maintainer, DBSource, Location, PoolFile, \ check_poolfile, get_poolfile_like_name, get_source_in_suite, \ get_suites_source_in, add_dsc_to_db, source_exists, DBBinary, \ - get_suites_binary_in, add_deb_to_db, Component + get_suites_binary_in, add_deb_to_db, Component, \ + get_component_by_package_suite from daklib.queue_install import package_to_suite from daklib.queue import get_newest_source, get_suite_version_by_source, \ get_source_by_package_and_suite, get_suite_version_by_package @@ -100,6 +101,9 @@ class PackageTestCase(DBDakTestCase): location = self.loc['main'], filesize = 0, md5sum = '') self.file['hello_2.2-1.dsc'] = PoolFile(filename = 'main/h/hello/hello_2.2-1.dsc', \ location = self.loc['main'], filesize = 0, md5sum = '') + self.file['gnome-hello_3.0-1.dsc'] = PoolFile( \ + filename = 'main/g/gnome-hello/gnome-hello_3.0-1.dsc', \ + location = self.loc['contrib'], filesize = 0, md5sum = '') self.file['hello_2.2-1_i386.deb'] = PoolFile( \ filename = 'main/h/hello/hello_2.2-1_i386.deb', \ location = self.loc['main'], filesize = 0, md5sum = '') @@ -109,6 +113,9 @@ class PackageTestCase(DBDakTestCase): self.file['python-hello_2.2-1_all.deb'] = PoolFile( \ filename = 'main/h/hello/python-hello_2.2-1_all.deb', \ location = self.loc['main'], filesize = 0, md5sum = '') + self.file['gnome-hello_3.0-1_i386.deb'] = PoolFile( \ + filename = 'main/g/gnome-hello/gnome-hello_3.0-1_i386.deb', \ + location = self.loc['contrib'], filesize = 0, md5sum = '') self.file['sl_3.03-16.dsc'] = PoolFile(filename = 'main/s/sl/sl_3.03-16.dsc', \ location = self.loc['main'], filesize = 0, md5sum = '') self.file['python2.6_2.6.6-8.dsc'] = PoolFile( \ @@ -146,6 +153,11 @@ class PackageTestCase(DBDakTestCase): changedby = self.maintainer['uploader'], \ poolfile = self.file['hello_2.2-1.dsc'], install_date = self.now()) self.source['hello_2.2-1'].suites.append(self.suite['sid']) + self.source['gnome-hello_3.0-1'] = DBSource(source = 'gnome-hello', \ + version = '3.0-1', maintainer = self.maintainer['maintainer'], \ + changedby = self.maintainer['uploader'], \ + poolfile = self.file['gnome-hello_3.0-1.dsc'], install_date = self.now()) + self.source['gnome-hello_3.0-1'].suites.append(self.suite['sid']) self.source['sl_3.03-16'] = DBSource(source = 'sl', version = '3.03-16', \ maintainer = self.maintainer['maintainer'], \ changedby = self.maintainer['uploader'], \ @@ -176,6 +188,12 @@ class PackageTestCase(DBDakTestCase): poolfile = self.file['gnome-hello_2.2-1_i386.deb']) self.binary['gnome-hello_2.2-1_i386'].suites.append(self.suite['squeeze']) self.binary['gnome-hello_2.2-1_i386'].suites.append(self.suite['sid']) + self.binary['gnome-hello_3.0-1_i386'] = DBBinary(package = 'gnome-hello', \ + source = self.source['gnome-hello_3.0-1'], version = '3.0-1', \ + maintainer = self.maintainer['maintainer'], \ + architecture = self.arch['i386'], \ + poolfile = self.file['gnome-hello_3.0-1_i386.deb']) + self.binary['gnome-hello_3.0-1_i386'].suites.append(self.suite['sid']) self.binary['python-hello_2.2-1_i386'] = DBBinary(package = 'python-hello', \ source = self.source['hello_2.2-1'], version = '2.2-1', \ maintainer = self.maintainer['maintainer'], \ @@ -237,9 +255,9 @@ class PackageTestCase(DBDakTestCase): main = self.loc['main'] contrib = self.loc['contrib'] self.assertEqual('/srv/ftp-master.debian.org/ftp/pool/', main.path) - count = len(self.file.keys()) + count = len(self.file.keys()) - 2 self.assertEqual(count, main.files.count()) - self.assertEqual(0, contrib.files.count()) + self.assertEqual(2, contrib.files.count()) poolfile = main.files. \ filter(PoolFile.filename.like('%/hello/hello%')). \ order_by(PoolFile.filename)[0] @@ -253,7 +271,7 @@ class PackageTestCase(DBDakTestCase): main.files.remove(self.file['sl_3.03-16.dsc']) contrib.files.append(self.file['sl_3.03-16.dsc']) self.assertEqual(count - 1, main.files.count()) - self.assertEqual(1, contrib.files.count()) + self.assertEqual(3, contrib.files.count()) # test fullpath self.assertEqual('/srv/ftp-master.debian.org/ftp/pool/main/s/sl/sl_3.03-16.dsc', \ self.file['sl_3.03-16.dsc'].fullpath) @@ -290,11 +308,11 @@ class PackageTestCase(DBDakTestCase): lazyguy = self.maintainer['lazyguy'] self.assertEqual(lazyguy, self.session.query(Maintainer).get(lazyguy.maintainer_id)) - self.assertEqual(3, len(maintainer.maintains_sources)) + self.assertEqual(4, len(maintainer.maintains_sources)) self.assertTrue(self.source['hello_2.2-2'] in maintainer.maintains_sources) self.assertEqual(maintainer.changed_sources, []) self.assertEqual(uploader.maintains_sources, []) - self.assertEqual(3, len(uploader.changed_sources)) + self.assertEqual(4, len(uploader.changed_sources)) self.assertTrue(self.source['sl_3.03-16'] in uploader.changed_sources) self.assertEqual(lazyguy.maintains_sources, []) self.assertEqual(lazyguy.changed_sources, []) @@ -436,7 +454,7 @@ class PackageTestCase(DBDakTestCase): ''' # test Suite relation - self.assertEqual(2, self.suite['sid'].binaries.count()) + self.assertEqual(3, self.suite['sid'].binaries.count()) self.assertTrue(self.binary['hello_2.2-1_i386'] in \ self.suite['sid'].binaries.all()) self.assertEqual(0, self.suite['lenny'].binaries.count()) @@ -523,5 +541,20 @@ class PackageTestCase(DBDakTestCase): self.assertEqual(self.loc['main'], self.comp['main'].location) self.assertEqual(self.loc['contrib'], self.comp['contrib'].location) + def test_get_component_by_package_suite(self): + 'test get_component_by_package_suite()' + + result = get_component_by_package_suite('hello', ['sid'], self.session) + self.assertEqual('main', result) + result = get_component_by_package_suite('hello', ['hamm'], self.session) + self.assertEqual(None, result) + result = get_component_by_package_suite('foobar', ['sid'], self.session) + self.assertEqual(None, result) + # test that the newest version is returend + result = get_component_by_package_suite('gnome-hello', ['squeeze'], self.session) + self.assertEqual('main', result) + result = get_component_by_package_suite('gnome-hello', ['sid'], self.session) + self.assertEqual('contrib', result) + if __name__ == '__main__': unittest.main()