Merge remote-tracking branch 'jcristau/formatone-no-tar-sig'

[dak.git] / tests / dbtest_packages.py

diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index 2b17905305c8df7314df27207ddd9e5f2175216c..8264127017df3001e84621d919953ab258d44fec 100755 (executable)
--- a/tests/dbtest_packages.py
+++ b/tests/dbtest_packages.py
@@ -4,9 +4,7 @@ from db_test import DBDakTestCase
 from base_test import fixture
 
 from daklib.dbconn import *
-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
+from daklib.queue import get_suite_version_by_source, get_suite_version_by_package
 
 from sqlalchemy.orm.exc import MultipleResultsFound
 import unittest
@@ -60,13 +58,6 @@ class PackageTestCase(DBDakTestCase):
         architectures = get_suite_architectures('lenny', skipall = True, session = self.session)
         self.assertEqual(3, len(architectures))
         self.assertTrue(self.arch['all'] not in architectures)
-        # check the function get_architecture_suites()
-        suites = get_architecture_suites('i386', self.session)
-        self.assertEqual(3, len(suites))
-        self.assertTrue(self.suite['lenny'] in suites)
-        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())
 
@@ -122,10 +113,6 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual((False, self.file['sl_3.03-16.dsc']), \
             check_poolfile('main/s/sl/sl_3.03-16.dsc', 0, 'deadbeef', \
                 contrib.location_id, self.session))
-        # test get_poolfile_like_name()
-        self.assertEqual([self.file['sl_3.03-16.dsc']], \
-            get_poolfile_like_name('sl_3.03-16.dsc', self.session))
-        self.assertEqual([], get_poolfile_like_name('foobar', self.session))
 
     def test_maintainers(self):
         '''
@@ -219,57 +206,6 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual(self.loc['main'].location_id, dsc_location_id)
         self.assertEqual([], pfs)
 
-    def test_source_exists(self):
-        'test function source_exists()'
-
-        hello = self.source['hello_2.2-2']
-        self.assertTrue(source_exists(hello.source, hello.version, \
-            suites = ['sid'], session = self.session))
-        # binNMU
-        self.assertTrue(source_exists(hello.source, hello.version + '+b7', \
-            suites = ['sid'], session = self.session))
-        self.assertTrue(not source_exists(hello.source, hello.version, \
-            suites = ['lenny', 'squeeze'], session = self.session))
-        self.assertTrue(not source_exists(hello.source, hello.version, \
-            suites = ['lenny', 'sid'], session = self.session))
-        self.assertTrue(not source_exists(hello.source, hello.version, \
-            suites = ['sid', 'lenny'], session = self.session))
-        self.assertTrue(not source_exists(hello.source, '0815', \
-            suites = ['sid'], session = self.session))
-        # 'any' suite
-        self.assertTrue(source_exists(hello.source, hello.version, \
-            session = self.session))
-
-    def test_package_to_suite(self):
-        'test function package_to_suite()'
-
-        pkg = Pkg()
-        pkg.changes = { 'distribution': {} }
-        upload = Upload(pkg)
-        self.assertTrue(not package_to_suite(upload, 'sid', self.session))
-        pkg.changes['distribution'] = { 'sid': '' }
-        pkg.changes['architecture'] = { 'source': '' }
-        self.assertTrue(package_to_suite(upload, 'sid', self.session))
-        pkg.changes['architecture'] = {}
-        pkg.changes['source'] = self.source['hello_2.2-2'].source
-        pkg.changes['version'] = self.source['hello_2.2-2'].version
-        self.assertTrue(not package_to_suite(upload, 'sid', self.session))
-        pkg.changes['version'] = '42'
-        self.assertTrue(package_to_suite(upload, 'sid', self.session))
-        pkg.changes['source'] = 'foobar'
-        pkg.changes['version'] = self.source['hello_2.2-2'].version
-        self.assertTrue(package_to_suite(upload, 'sid', self.session))
-        pkg.changes['distribution'] = { 'lenny': '' }
-        self.assertTrue(package_to_suite(upload, 'lenny', self.session))
-
-    def test_get_newest_source(self):
-        'test function get_newest_source()'
-
-        import daklib.queue
-        daklib.queue.dm_suites = ['sid']
-        self.assertEqual(self.source['hello_2.2-2'], get_newest_source('hello', self.session))
-        self.assertEqual(None, get_newest_source('foobar', self.session))
-
     def test_get_suite_version_by_source(self):
         'test function get_suite_version_by_source()'
 
@@ -328,7 +264,7 @@ class PackageTestCase(DBDakTestCase):
             'sha1sum': 'deadbeef',
             'sha256sum': 'deadbeef'}
         upload = Upload(pkg)
-        poolfile = add_deb_to_db(upload, 'hello_2.2-2_i386.deb', self.session)
+        bin, poolfile = add_deb_to_db(upload, 'hello_2.2-2_i386.deb', self.session)
         self.session.refresh(poolfile)
         self.session.refresh(poolfile.binary)
         self.assertEqual('main/h/hello/hello_2.2-2_i386.deb', poolfile.filename)
@@ -345,18 +281,6 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual('deadbeef', poolfile.sha1sum)
         self.assertEqual('deadbeef', poolfile.sha256sum)
 
-    def test_get_source_by_package_and_suite(self):
-        'test get_source_by_package_and_suite()'
-
-        query = get_source_by_package_and_suite('hello', 'sid', self.session)
-        self.assertEqual(self.source['hello_2.2-1'], query.one())
-        query = get_source_by_package_and_suite('gnome-hello', 'squeeze', self.session)
-        self.assertEqual(self.source['hello_2.2-1'], query.one())
-        query = get_source_by_package_and_suite('hello', 'hamm', self.session)
-        self.assertEqual(0, query.count())
-        query = get_source_by_package_and_suite('foobar', 'squeeze', self.session)
-        self.assertEqual(0, query.count())
-
     def test_get_suite_version_by_package(self):
         'test function get_suite_version_by_package()'