]> git.decadent.org.uk Git - dak.git/commitdiff
Merge branch 'dbtests' into merge
authorTorsten Werner <twerner@debian.org>
Thu, 27 Jan 2011 18:44:33 +0000 (19:44 +0100)
committerTorsten Werner <twerner@debian.org>
Thu, 27 Jan 2011 18:44:33 +0000 (19:44 +0100)
* Remove function get_binary_components().
* Test and refactor get_component_by_package_suite().
* Convert class Component to ORMObject.
* Drop class BinAssociation.
* Create, test, and refactor get_suite_version_by_package().
* Create, test, and refactor get_source_by_package_and_suite().
* Remove unused function get_binaries_from_source_id().
* Remove unused function get_binaries_from_name().
* Remove unused function get_binary_from_id().
* Test and refactor function add_deb_to_db().
* Refactor and test class DBBinary.

Signed-off-by: Torsten Werner <twerner@debian.org>
dak/examine_package.py
daklib/dbconn.py
daklib/queue.py
tests/dbtest_packages.py
tests/fixtures/dak.conf

index 0e1b34ff23ee9b86802af1668c7d574b868e34a1..38432b11df82052861fb4d83d718f3aeb16c6344 100755 (executable)
@@ -60,7 +60,7 @@ import commands
 import threading
 
 from daklib import utils
-from daklib.dbconn import DBConn, get_binary_from_name_suite
+from daklib.dbconn import DBConn, get_component_by_package_suite
 from daklib.regexes import html_escaping, re_html_escaping, re_version, re_spacestrip, \
                            re_contrib, re_nonfree, re_localhost, re_newlinespace, \
                            re_package, re_doc_directory
@@ -325,9 +325,9 @@ def read_changes_or_dsc (suite, filename, session = None):
 def create_depends_string (suite, depends_tree, session = None):
     result = ""
     if suite == 'experimental':
-        suite_where = "in ('experimental','unstable')"
+        suite_list = ['experimental','unstable']
     else:
-        suite_where = "= '%s'" % suite
+        suite_list = [suite]
 
     comma_count = 1
     for l in depends_tree:
@@ -339,17 +339,16 @@ def create_depends_string (suite, depends_tree, session = None):
                 result += " | "
             # doesn't do version lookup yet.
 
-            res = get_binary_from_name_suite(d['name'], suite_where, session)
-            if res.rowcount > 0:
-                i = res.fetchone()
-
+            component = get_component_by_package_suite(d['name'], suite_list, \
+                session = session)
+            if component is not None:
                 adepends = d['name']
                 if d['version'] != '' :
                     adepends += " (%s)" % (d['version'])
 
-                if i[2] == "contrib":
+                if component == "contrib":
                     result += colour_output(adepends, "contrib")
-                elif i[2] == "non-free":
+                elif component == "non-free":
                     result += colour_output(adepends, "nonfree")
                 else :
                     result += colour_output(adepends, "main")
index 020040c98294e4703950adc3aee45e461e8b2f0e..efe2d13761551a7f243c512a81cd779a33b35a0f 100755 (executable)
@@ -53,7 +53,7 @@ from tempfile import mkstemp, mkdtemp
 from inspect import getargspec
 
 import sqlalchemy
-from sqlalchemy import create_engine, Table, MetaData, Column, Integer
+from sqlalchemy import create_engine, Table, MetaData, Column, Integer, desc
 from sqlalchemy.orm import sessionmaker, mapper, relation, object_session, \
     backref, MapperExtension, EXT_CONTINUE
 from sqlalchemy import types as sqltypes
@@ -421,17 +421,6 @@ __all__.append('get_archive')
 
 ################################################################################
 
-class BinAssociation(object):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def __repr__(self):
-        return '<BinAssociation %s (%s, %s)>' % (self.ba_id, self.binary, self.suite)
-
-__all__.append('BinAssociation')
-
-################################################################################
-
 class BinContents(object):
     def __init__(self, *args, **kwargs):
         pass
@@ -443,12 +432,29 @@ __all__.append('BinContents')
 
 ################################################################################
 
-class DBBinary(object):
-    def __init__(self, *args, **kwargs):
-        pass
+class DBBinary(ORMObject):
+    def __init__(self, package = None, source = None, version = None, \
+        maintainer = None, architecture = None, poolfile = None, \
+        binarytype = 'deb'):
+        self.package = package
+        self.source = source
+        self.version = version
+        self.maintainer = maintainer
+        self.architecture = architecture
+        self.poolfile = poolfile
+        self.binarytype = binarytype
 
-    def __repr__(self):
-        return '<DBBinary %s (%s, %s)>' % (self.package, self.version, self.architecture)
+    def properties(self):
+        return ['package', 'version', 'maintainer', 'source', 'architecture', \
+            'poolfile', 'binarytype', 'fingerprint', 'install_date', \
+            'suites_count', 'binary_id']
+
+    def not_null_constraints(self):
+        return ['package', 'version', 'maintainer', 'source',  'poolfile', \
+            'binarytype']
+
+    def get_component_name(self):
+        return self.poolfile.location.component.component_name
 
 __all__.append('DBBinary')
 
@@ -464,129 +470,42 @@ def get_suites_binary_in(package, session=None):
     @return: list of Suite objects for the given package
     """
 
-    return session.query(Suite).join(BinAssociation).join(DBBinary).filter_by(package=package).all()
+    return session.query(Suite).filter(Suite.binaries.any(DBBinary.package == package)).all()
 
 __all__.append('get_suites_binary_in')
 
 @session_wrapper
-def get_binary_from_id(binary_id, session=None):
-    """
-    Returns DBBinary object for given C{id}
-
-    @type binary_id: int
-    @param binary_id: Id of the required binary
-
-    @type session: Session
-    @param session: Optional SQLA session object (a temporary one will be
-    generated if not supplied)
-
-    @rtype: DBBinary
-    @return: DBBinary object for the given binary (None if not present)
-    """
-
-    q = session.query(DBBinary).filter_by(binary_id=binary_id)
-
-    try:
-        return q.one()
-    except NoResultFound:
-        return None
-
-__all__.append('get_binary_from_id')
-
-@session_wrapper
-def get_binaries_from_name(package, version=None, architecture=None, session=None):
-    """
-    Returns list of DBBinary objects for given C{package} name
+def get_component_by_package_suite(package, suite_list, arch_list=[], session=None):
+    '''
+    Returns the component name of the newest binary package in suite_list or
+    None if no package is found. The result can be optionally filtered by a list
+    of architecture names.
 
     @type package: str
     @param package: DBBinary package name to search for
 
-    @type version: str or None
-    @param version: Version to search for (or None)
-
-    @type architecture: str, list or None
-    @param architecture: Architectures to limit to (or None if no limit)
-
-    @type session: Session
-    @param session: Optional SQL session object (a temporary one will be
-    generated if not supplied)
-
-    @rtype: list
-    @return: list of DBBinary objects for the given name (may be empty)
-    """
+    @type suite_list: list of str
+    @param suite_list: list of suite_name items
 
-    q = session.query(DBBinary).filter_by(package=package)
+    @type arch_list: list of str
+    @param arch_list: optional list of arch_string items that defaults to []
 
-    if version is not None:
-        q = q.filter_by(version=version)
-
-    if architecture is not None:
-        if not isinstance(architecture, list):
-            architecture = [architecture]
-        q = q.join(Architecture).filter(Architecture.arch_string.in_(architecture))
-
-    ret = q.all()
-
-    return ret
-
-__all__.append('get_binaries_from_name')
-
-@session_wrapper
-def get_binaries_from_source_id(source_id, session=None):
-    """
-    Returns list of DBBinary objects for given C{source_id}
-
-    @type source_id: int
-    @param source_id: source_id to search for
-
-    @type session: Session
-    @param session: Optional SQL session object (a temporary one will be
-    generated if not supplied)
-
-    @rtype: list
-    @return: list of DBBinary objects for the given name (may be empty)
-    """
-
-    return session.query(DBBinary).filter_by(source_id=source_id).all()
-
-__all__.append('get_binaries_from_source_id')
-
-@session_wrapper
-def get_binary_from_name_suite(package, suitename, session=None):
-    ### For dak examine-package
-    ### XXX: Doesn't use object API yet
-
-    sql = """SELECT DISTINCT(b.package), b.version, c.name, su.suite_name
-             FROM binaries b, files fi, location l, component c, bin_associations ba, suite su
-             WHERE b.package='%(package)s'
-               AND b.file = fi.id
-               AND fi.location = l.id
-               AND l.component = c.id
-               AND ba.bin=b.id
-               AND ba.suite = su.id
-               AND su.suite_name %(suitename)s
-          ORDER BY b.version DESC"""
-
-    return session.execute(sql % {'package': package, 'suitename': suitename})
-
-__all__.append('get_binary_from_name_suite')
-
-@session_wrapper
-def get_binary_components(package, suitename, arch, session=None):
-    # Check for packages that have moved from one component to another
-    query = """SELECT c.name FROM binaries b, bin_associations ba, suite s, location l, component c, architecture a, files f
-    WHERE b.package=:package AND s.suite_name=:suitename
-      AND (a.arch_string = :arch OR a.arch_string = 'all')
-      AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id
-      AND f.location = l.id
-      AND l.component = c.id
-      AND b.file = f.id"""
-
-    vals = {'package': package, 'suitename': suitename, 'arch': arch}
+    @rtype: str or NoneType
+    @return: name of component or None
+    '''
 
-    return session.execute(query, vals)
+    q = session.query(DBBinary).filter_by(package = package). \
+        join(DBBinary.suites).filter(Suite.suite_name.in_(suite_list))
+    if len(arch_list) > 0:
+        q = q.join(DBBinary.architecture). \
+            filter(Architecture.arch_string.in_(arch_list))
+    binary = q.order_by(desc(DBBinary.version)).first()
+    if binary is None:
+        return None
+    else:
+        return binary.get_component_name()
 
-__all__.append('get_binary_components')
+__all__.append('get_component_by_package_suite')
 
 ################################################################################
 
@@ -929,9 +848,9 @@ __all__.append('ChangePendingSource')
 
 ################################################################################
 
-class Component(object):
-    def __init__(self, *args, **kwargs):
-        pass
+class Component(ORMObject):
+    def __init__(self, component_name = None):
+        self.component_name = component_name
 
     def __eq__(self, val):
         if isinstance(val, str):
@@ -945,8 +864,12 @@ class Component(object):
         # This signals to use the normal comparison operator
         return NotImplemented
 
-    def __repr__(self):
-        return '<Component %s>' % self.component_name
+    def properties(self):
+        return ['component_name', 'component_id', 'description', 'location', \
+            'meets_dfsg']
+
+    def not_null_constraints(self):
+        return ['component_name']
 
 
 __all__.append('Component')
@@ -1243,7 +1166,7 @@ class PoolFile(ORMObject):
 
     def properties(self):
         return ['filename', 'file_id', 'filesize', 'md5sum', 'sha1sum', \
-            'sha256sum', 'location', 'source', 'last_used']
+            'sha256sum', 'location', 'source', 'binary', 'last_used']
 
     def not_null_constraints(self):
         return ['filename', 'md5sum', 'location']
@@ -1652,9 +1575,12 @@ __all__.append('get_dbchange')
 
 ################################################################################
 
+# TODO: Why do we have a separate Location class? Can't it be fully integrated
+# into class Component?
 class Location(ORMObject):
-    def __init__(self, path = None):
+    def __init__(self, path = None, component = None):
         self.path = path
+        self.component = component
         # the column 'type' should go away, see comment at mapper
         self.archive_type = 'pool'
 
@@ -2257,7 +2183,7 @@ class DBSource(ORMObject):
     def properties(self):
         return ['source', 'source_id', 'maintainer', 'changedby', \
             'fingerprint', 'poolfile', 'version', 'suites_count', \
-            'install_date']
+            'install_date', 'binaries_count']
 
     def not_null_constraints(self):
         return ['source', 'version', 'install_date', 'maintainer', \
@@ -2558,14 +2484,10 @@ def add_deb_to_db(u, filename, session=None):
 
     # Add and flush object so it has an ID
     session.add(bin)
-    session.flush()
 
-    # Add BinAssociations
-    for suite_name in u.pkg.changes["distribution"].keys():
-        ba = BinAssociation()
-        ba.binary_id = bin.binary_id
-        ba.suite_id = get_suite(suite_name).suite_id
-        session.add(ba)
+    suite_names = u.pkg.changes["distribution"].keys()
+    bin.suites = session.query(Suite). \
+        filter(Suite.suite_name.in_(suite_names)).all()
 
     session.flush()
 
@@ -2639,7 +2561,7 @@ class Suite(ORMObject):
         self.version = version
 
     def properties(self):
-        return ['suite_name', 'version']
+        return ['suite_name', 'version', 'sources_count', 'binaries_count']
 
     def not_null_constraints(self):
         return ['suite_name', 'version']
@@ -3012,13 +2934,6 @@ class DBConn(object):
                properties = dict(archive_id = self.tbl_archive.c.id,
                                  archive_name = self.tbl_archive.c.name))
 
-        mapper(BinAssociation, self.tbl_bin_associations,
-               properties = dict(ba_id = self.tbl_bin_associations.c.id,
-                                 suite_id = self.tbl_bin_associations.c.suite,
-                                 suite = relation(Suite),
-                                 binary_id = self.tbl_bin_associations.c.bin,
-                                 binary = relation(DBBinary)))
-
         mapper(PendingBinContents, self.tbl_pending_bin_contents,
                properties = dict(contents_id =self.tbl_pending_bin_contents.c.id,
                                  filename = self.tbl_pending_bin_contents.c.filename,
@@ -3057,17 +2972,18 @@ class DBConn(object):
                                  maintainer_id = self.tbl_binaries.c.maintainer,
                                  maintainer = relation(Maintainer),
                                  source_id = self.tbl_binaries.c.source,
-                                 source = relation(DBSource),
+                                 source = relation(DBSource, backref='binaries'),
                                  arch_id = self.tbl_binaries.c.architecture,
                                  architecture = relation(Architecture),
                                  poolfile_id = self.tbl_binaries.c.file,
-                                 poolfile = relation(PoolFile),
+                                 poolfile = relation(PoolFile, backref=backref('binary', uselist = False)),
                                  binarytype = self.tbl_binaries.c.type,
                                  fingerprint_id = self.tbl_binaries.c.sig_fpr,
                                  fingerprint = relation(Fingerprint),
                                  install_date = self.tbl_binaries.c.install_date,
-                                 binassociations = relation(BinAssociation,
-                                                            primaryjoin=(self.tbl_binaries.c.id==self.tbl_bin_associations.c.bin))))
+                                 suites = relation(Suite, secondary=self.tbl_bin_associations,
+                                     backref=backref('binaries', lazy='dynamic'))),
+                extension = validator)
 
         mapper(BinaryACL, self.tbl_binary_acl,
                properties = dict(binary_acl_id = self.tbl_binary_acl.c.id))
@@ -3079,7 +2995,8 @@ class DBConn(object):
 
         mapper(Component, self.tbl_component,
                properties = dict(component_id = self.tbl_component.c.id,
-                                 component_name = self.tbl_component.c.name))
+                                 component_name = self.tbl_component.c.name),
+               extension = validator)
 
         mapper(DBConfig, self.tbl_config,
                properties = dict(config_id = self.tbl_config.c.id))
@@ -3171,7 +3088,8 @@ class DBConn(object):
         mapper(Location, self.tbl_location,
                properties = dict(location_id = self.tbl_location.c.id,
                                  component_id = self.tbl_location.c.component,
-                                 component = relation(Component),
+                                 component = relation(Component, \
+                                     backref=backref('location', uselist = False)),
                                  archive_id = self.tbl_location.c.archive,
                                  archive = relation(Archive),
                                  # FIXME: the 'type' column is old cruft and
@@ -3229,7 +3147,7 @@ class DBConn(object):
                                  srcfiles = relation(DSCFile,
                                                      primaryjoin=(self.tbl_source.c.id==self.tbl_dsc_files.c.source)),
                                  suites = relation(Suite, secondary=self.tbl_src_associations,
-                                     backref='sources'),
+                                     backref=backref('sources', lazy='dynamic')),
                                  srcuploaders = relation(SrcUploader)),
                extension = validator)
 
index 08ac23fa8f96a414b9eb7f5c0e4a3f5e5eecbaab..bbbf1dfa1fe7949e94491361a30c573d19a692d9 100755 (executable)
@@ -383,12 +383,31 @@ def get_newest_source(source, session):
         order_by(desc('source.version'))
     return q.first()
 
-def get_suite_version(source, session):
+def get_suite_version_by_source(source, session):
     'returns a list of tuples (suite_name, version) for source package'
     q = session.query(Suite.suite_name, DBSource.version). \
         join(Suite.sources).filter_by(source = source)
     return q.all()
 
+def get_source_by_package_and_suite(package, suite_name, session):
+    '''
+    returns a DBSource query filtered by DBBinary.package and this package's
+    suite_name
+    '''
+    return session.query(DBSource). \
+        join(DBSource.binaries).filter_by(package = package). \
+        join(DBBinary.suites).filter_by(suite_name = suite_name)
+
+def get_suite_version_by_package(package, arch_string, session):
+    '''
+    returns a list of tuples (suite_name, version) for binary package and
+    arch_string
+    '''
+    return session.query(Suite.suite_name, DBBinary.version). \
+        join(Suite.binaries).filter_by(package = package). \
+        join(DBBinary.architecture). \
+        filter(Architecture.arch_string.in_([arch_string, 'all'])).all()
+
 class Upload(object):
     """
     Everything that has to do with an upload processed.
@@ -953,9 +972,11 @@ class Upload(object):
 
         # Check for packages that have moved from one component to another
         entry['suite'] = suite
-        res = get_binary_components(self.pkg.files[f]['package'], suite, entry["architecture"], session)
-        if res.rowcount > 0:
-            entry["othercomponents"] = res.fetchone()[0]
+        arch_list = [entry["architecture"], 'all']
+        component = get_component_by_package_suite(self.pkg.files[f]['package'], \
+            [suite], arch_list = arch_list, session = session)
+        if component is not None:
+            entry["othercomponents"] = component
 
     def check_files(self, action=True):
         file_keys = self.pkg.files.keys()
@@ -1738,11 +1759,7 @@ class Upload(object):
         ## none of the packages are being taken over from other source packages
         for b in self.pkg.changes["binary"].keys():
             for suite in self.pkg.changes["distribution"].keys():
-                q = session.query(DBSource)
-                q = q.join(DBBinary).filter_by(package=b)
-                q = q.join(BinAssociation).join(Suite).filter_by(suite_name=suite)
-
-                for s in q.all():
+                for s in get_source_by_package_and_suite(b, suite, session):
                     if s.source != self.pkg.changes["source"]:
                         self.rejects.append("%s may not hijack %s from source package %s in suite %s" % (fpr.uid.uid, b, s, suite))
 
@@ -2499,12 +2516,10 @@ distribution."""
     ################################################################################
     def check_binary_against_db(self, filename, session):
         # Ensure version is sane
-        q = session.query(BinAssociation)
-        q = q.join(DBBinary).filter(DBBinary.package==self.pkg.files[filename]["package"])
-        q = q.join(Architecture).filter(Architecture.arch_string.in_([self.pkg.files[filename]["architecture"], 'all']))
-
-        self.cross_suite_version_check([ (x.suite.suite_name, x.binary.version) for x in q.all() ],
-                                       filename, self.pkg.files[filename]["version"], sourceful=False)
+        self.cross_suite_version_check( \
+            get_suite_version_by_package(self.pkg.files[filename]["package"], \
+                self.pkg.files[filename]["architecture"], session),
+            filename, self.pkg.files[filename]["version"], sourceful=False)
 
         # Check for any existing copies of the file
         q = session.query(DBBinary).filter_by(package=self.pkg.files[filename]["package"])
@@ -2521,8 +2536,9 @@ distribution."""
         version = self.pkg.dsc.get("version")
 
         # Ensure version is sane
-        self.cross_suite_version_check(get_suite_version(source, session),
-                                       filename, version, sourceful=True)
+        self.cross_suite_version_check( \
+            get_suite_version_by_source(source, session), filename, version,
+            sourceful=True)
 
     ################################################################################
     def check_dsc_against_db(self, filename, session):
index 9eb8c6f274d8a7d65186e393ca1bcf79491e1ff2..a7c861be9d2937b142d69dfbc12ca77b0a4791da 100755 (executable)
@@ -5,9 +5,12 @@ from db_test import DBDakTestCase
 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
+    get_suites_source_in, add_dsc_to_db, source_exists, DBBinary, \
+    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
+from daklib.queue import get_newest_source, get_suite_version_by_source, \
+    get_source_by_package_and_suite, get_suite_version_by_package
 
 from sqlalchemy.orm.exc import MultipleResultsFound
 import unittest
@@ -60,16 +63,29 @@ class PackageTestCase(DBDakTestCase):
         self.arch['all'].arch_id = 2
         self.session.add_all(self.arch.values())
 
+    def setup_components(self):
+        'create some Component objects'
+
+        if 'comp' in self.__dict__:
+            return
+        self.comp = {}
+        self.comp['main'] = Component(component_name = 'main')
+        self.comp['contrib'] = Component(component_name = 'contrib')
+        self.session.add_all(self.comp.values())
+
     def setup_locations(self):
-        'create some Location objects, TODO: add component'
+        'create some Location objects'
 
         if 'loc' in self.__dict__:
             return
+        self.setup_components()
         self.loc = {}
-        self.loc['main'] = Location(path = \
-            '/srv/ftp-master.debian.org/ftp/pool/')
-        self.loc['contrib'] = Location(path = \
-            '/srv/ftp-master.debian.org/ftp/pool/')
+        self.loc['main'] = Location( \
+            path = '/srv/ftp-master.debian.org/ftp/pool/', \
+            component = self.comp['main'])
+        self.loc['contrib'] = Location( \
+            path = '/srv/ftp-master.debian.org/ftp/pool/', \
+            component = self.comp['contrib'])
         self.session.add_all(self.loc.values())
 
     def setup_poolfiles(self):
@@ -79,15 +95,30 @@ class PackageTestCase(DBDakTestCase):
             return
         self.setup_locations()
         self.file = {}
-        self.file['hello_new'] = PoolFile(filename = 'main/h/hello/hello_2.2-3.dsc', \
+        self.file['hello_2.2-3.dsc'] = PoolFile(filename = 'main/h/hello/hello_2.2-3.dsc', \
+            location = self.loc['main'], filesize = 0, md5sum = '')
+        self.file['hello_2.2-2.dsc'] = PoolFile(filename = 'main/h/hello/hello_2.2-2.dsc', \
+            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['hello'] = PoolFile(filename = 'main/h/hello/hello_2.2-2.dsc', \
+        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 = '')
-        self.file['hello_old'] = PoolFile(filename = 'main/h/hello/hello_2.2-1.dsc', \
+        self.file['gnome-hello_2.2-1_i386.deb'] = PoolFile( \
+            filename = 'main/h/hello/gnome-hello_2.2-1_i386.deb', \
             location = self.loc['main'], filesize = 0, md5sum = '')
-        self.file['sl'] = PoolFile(filename = 'main/s/sl/sl_3.03-16.dsc', \
+        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['python'] = PoolFile( \
+        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( \
             filename = 'main/p/python2.6/python2.6_2.6.6-8.dsc', \
             location = self.loc['main'], filesize = 0, md5sum = '')
         self.session.add_all(self.file.values())
@@ -104,35 +135,76 @@ class PackageTestCase(DBDakTestCase):
         self.session.add_all(self.maintainer.values())
 
     def setup_sources(self):
-        'create a DBSource object; but it cannot be stored in the DB yet'
+        'create DBSource objects'
 
         if 'source' in self.__dict__:
             return
         self.setup_maintainers()
+        self.setup_suites()
+        self.setup_poolfiles()
         self.source = {}
-        self.source['hello'] = DBSource(source = 'hello', version = '2.2-2', \
+        self.source['hello_2.2-2'] = DBSource(source = 'hello', version = '2.2-2', \
             maintainer = self.maintainer['maintainer'], \
             changedby = self.maintainer['uploader'], \
-            poolfile = self.file['hello'], install_date = self.now())
-        self.source['hello'].suites.append(self.suite['sid'])
-        self.source['hello_old'] = DBSource(source = 'hello', version = '2.2-1', \
+            poolfile = self.file['hello_2.2-2.dsc'], install_date = self.now())
+        self.source['hello_2.2-2'].suites.append(self.suite['sid'])
+        self.source['hello_2.2-1'] = DBSource(source = 'hello', version = '2.2-1', \
             maintainer = self.maintainer['maintainer'], \
             changedby = self.maintainer['uploader'], \
-            poolfile = self.file['hello_old'], install_date = self.now())
-        self.source['hello_old'].suites.append(self.suite['sid'])
-        self.source['sl'] = DBSource(source = 'sl', version = '3.03-16', \
+            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'], \
-            poolfile = self.file['sl'], install_date = self.now())
-        self.source['sl'].suites.append(self.suite['squeeze'])
-        self.source['sl'].suites.append(self.suite['sid'])
+            poolfile = self.file['sl_3.03-16.dsc'], install_date = self.now())
+        self.source['sl_3.03-16'].suites.append(self.suite['squeeze'])
+        self.source['sl_3.03-16'].suites.append(self.suite['sid'])
         self.session.add_all(self.source.values())
 
+    def setup_binaries(self):
+        'create DBBinary objects'
+
+        if 'binary' in self.__dict__:
+            return
+        self.setup_sources()
+        self.setup_architectures()
+        self.binary = {}
+        self.binary['hello_2.2-1_i386'] = DBBinary(package = 'hello', \
+            source = self.source['hello_2.2-1'], version = '2.2-1', \
+            maintainer = self.maintainer['maintainer'], \
+            architecture = self.arch['i386'], \
+            poolfile = self.file['hello_2.2-1_i386.deb'])
+        self.binary['hello_2.2-1_i386'].suites.append(self.suite['squeeze'])
+        self.binary['hello_2.2-1_i386'].suites.append(self.suite['sid'])
+        self.binary['gnome-hello_2.2-1_i386'] = DBBinary(package = 'gnome-hello', \
+            source = self.source['hello_2.2-1'], version = '2.2-1', \
+            maintainer = self.maintainer['maintainer'], \
+            architecture = self.arch['i386'], \
+            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'], \
+            architecture = self.arch['all'], \
+            poolfile = self.file['python-hello_2.2-1_all.deb'])
+        self.binary['python-hello_2.2-1_i386'].suites.append(self.suite['squeeze'])
+        self.session.add_all(self.binary.values())
+
     def setUp(self):
         super(PackageTestCase, self).setUp()
-        self.setup_architectures()
-        self.setup_poolfiles()
-        self.setup_sources()
+        self.setup_binaries()
         # flush to make sure that the setup is correct
         self.session.flush()
 
@@ -183,39 +255,40 @@ class PackageTestCase(DBDakTestCase):
         main = self.loc['main']
         contrib = self.loc['contrib']
         self.assertEqual('/srv/ftp-master.debian.org/ftp/pool/', main.path)
-        self.assertEqual(5, main.files.count())
-        self.assertEqual(0, contrib.files.count())
+        count = len(self.file.keys()) - 2
+        self.assertEqual(count, main.files.count())
+        self.assertEqual(2, contrib.files.count())
         poolfile = main.files. \
                 filter(PoolFile.filename.like('%/hello/hello%')). \
-                order_by(PoolFile.filename)[1]
-        self.assertEqual('main/h/hello/hello_2.2-2.dsc', poolfile.filename)
+                order_by(PoolFile.filename)[0]
+        self.assertEqual('main/h/hello/hello_2.2-1.dsc', poolfile.filename)
         self.assertEqual(main, poolfile.location)
         # test get()
         self.assertEqual(poolfile, \
                 self.session.query(PoolFile).get(poolfile.file_id))
         self.assertEqual(None, self.session.query(PoolFile).get(-1))
         # test remove() and append()
-        main.files.remove(self.file['sl'])
-        contrib.files.append(self.file['sl'])
-        self.assertEqual(4, main.files.count())
-        self.assertEqual(1, contrib.files.count())
+        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(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'].fullpath)
+            self.file['sl_3.03-16.dsc'].fullpath)
         # test check_poolfile()
-        self.assertEqual((True, self.file['sl']), \
+        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']), \
+        self.assertEqual((False, self.file['sl_3.03-16.dsc']), \
             check_poolfile('main/s/sl/sl_3.03-16.dsc', 42, '', \
                 contrib.location_id, self.session))
-        self.assertEqual((False, self.file['sl']), \
+        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']], \
+        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))
 
@@ -235,12 +308,12 @@ 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.assertTrue(self.source['hello'] in 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.assertTrue(self.source['sl'] in 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, [])
 
@@ -258,26 +331,26 @@ class PackageTestCase(DBDakTestCase):
         'test relation between DBSource and PoolFile or Suite'
 
         # test PoolFile
-        self.assertEqual(self.file['hello'], self.source['hello'].poolfile)
-        self.assertEqual(self.source['hello'], self.file['hello'].source)
-        self.assertEqual(None, self.file['python'].source)
+        self.assertEqual(self.file['hello_2.2-2.dsc'], self.source['hello_2.2-2'].poolfile)
+        self.assertEqual(self.source['hello_2.2-2'], self.file['hello_2.2-2.dsc'].source)
+        self.assertEqual(None, self.file['python2.6_2.6.6-8.dsc'].source)
         # test Suite
         squeeze = self.session.query(Suite). \
-            filter(Suite.sources.contains(self.source['sl'])). \
+            filter(Suite.sources.contains(self.source['sl_3.03-16'])). \
             order_by(Suite.suite_name)[1]
         self.assertEqual(self.suite['squeeze'], squeeze)
-        self.assertEqual(1, len(squeeze.sources))
-        self.assertEqual(self.source['sl'], squeeze.sources[0])
+        self.assertEqual(1, squeeze.sources.count())
+        self.assertEqual(self.source['sl_3.03-16'], squeeze.sources[0])
         sl = self.session.query(DBSource). \
             filter(DBSource.suites.contains(self.suite['squeeze'])).one()
-        self.assertEqual(self.source['sl'], sl)
+        self.assertEqual(self.source['sl_3.03-16'], sl)
         self.assertEqual(2, len(sl.suites))
         self.assertTrue(self.suite['sid'] in sl.suites)
         # test get_source_in_suite()
         self.assertRaises(MultipleResultsFound, self.get_source_in_suite_fail)
         self.assertEqual(None, \
             get_source_in_suite('hello', 'squeeze', self.session))
-        self.assertEqual(self.source['sl'], \
+        self.assertEqual(self.source['sl_3.03-16'], \
             get_source_in_suite('sl', 'sid', self.session))
         # test get_suites_source_in()
         self.assertEqual([self.suite['sid']], \
@@ -286,7 +359,7 @@ class PackageTestCase(DBDakTestCase):
         self.assertTrue(self.suite['squeeze'] in \
             get_suites_source_in('sl', self.session))
 
-    def test_upload(self):
+    def test_add_dsc_to_db(self):
         'tests function add_dsc_to_db()'
 
         pkg = Pkg()
@@ -298,8 +371,8 @@ class PackageTestCase(DBDakTestCase):
         pkg.changes['distribution'] = { 'sid': '' }
         pkg.files['hello_2.2-3.dsc'] = { \
             'component': 'main',
-            'location id': self.loc['main'].component_id,
-            'files id': self.file['hello_new'].file_id }
+            'location id': self.loc['main'].location_id,
+            'files id': self.file['hello_2.2-3.dsc'].file_id }
         pkg.dsc_files = {}
         upload = Upload(pkg)
         (source, dsc_component, dsc_location_id, pfs) = \
@@ -308,14 +381,13 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual('2.2-3', source.version)
         self.assertEqual('sid', source.suites[0].suite_name)
         self.assertEqual('main', dsc_component)
-        # no dsc files defined above
-        self.assertEqual(None, dsc_location_id)
+        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']
+        hello = self.source['hello_2.2-2']
         self.assertTrue(source_exists(hello.source, hello.version, \
             suites = ['sid'], session = self.session))
         # binNMU
@@ -344,13 +416,13 @@ class PackageTestCase(DBDakTestCase):
         pkg.changes['architecture'] = { 'source': '' }
         self.assertTrue(package_to_suite(upload, 'sid', self.session))
         pkg.changes['architecture'] = {}
-        pkg.changes['source'] = self.source['hello'].source
-        pkg.changes['version'] = self.source['hello'].version
+        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'].version
+        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))
@@ -360,20 +432,141 @@ class PackageTestCase(DBDakTestCase):
 
         import daklib.queue
         daklib.queue.dm_suites = ['sid']
-        self.assertEqual(self.source['hello'], get_newest_source('hello', self.session))
+        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(self):
-        'test function get_suite_version()'
+    def test_get_suite_version_by_source(self):
+        'test function get_suite_version_by_source()'
 
-        result = get_suite_version('hello', self.session)
+        result = get_suite_version_by_source('hello', self.session)
         self.assertEqual(2, len(result))
         self.assertTrue(('sid', '2.2-1') in result)
         self.assertTrue(('sid', '2.2-2') in result)
-        result = get_suite_version('sl', self.session)
+        result = get_suite_version_by_source('sl', self.session)
         self.assertEqual(2, len(result))
         self.assertTrue(('squeeze', '3.03-16') in result)
         self.assertTrue(('sid', '3.03-16') in result)
 
+    def test_binaries(self):
+        '''
+        tests class DBBinary; TODO: test relation with Architecture, Maintainer,
+        PoolFile, and Fingerprint
+        '''
+
+        # test Suite relation
+        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())
+        # test DBSource relation
+        self.assertEqual(3, len(self.source['hello_2.2-1'].binaries))
+        self.assertTrue(self.binary['hello_2.2-1_i386'] in \
+            self.source['hello_2.2-1'].binaries)
+        self.assertEqual(0, len(self.source['hello_2.2-2'].binaries))
+        # test get_suites_binary_in()
+        self.assertEqual(2, len(get_suites_binary_in('hello', self.session)))
+        self.assertTrue(self.suite['sid'] in \
+            get_suites_binary_in('hello', self.session))
+        self.assertEqual(2, len(get_suites_binary_in('gnome-hello', self.session)))
+        self.assertTrue(self.suite['squeeze'] in \
+            get_suites_binary_in('gnome-hello', self.session))
+        self.assertEqual(0, len(get_suites_binary_in('sl', self.session)))
+
+    def test_add_deb_to_db(self):
+        'tests function add_deb_to_db()'
+
+        pkg = Pkg()
+        pkg.changes['fingerprint'] = 'deadbeef'
+        pkg.changes['distribution'] = { 'sid': '' }
+        pkg.files['hello_2.2-2_i386.deb'] = { \
+            'package': 'hello',
+            'version': '2.2-2',
+            'maintainer': self.maintainer['maintainer'].name,
+            'architecture': 'i386',
+            'dbtype': 'deb',
+            'pool name': 'main/h/hello/',
+            'location id': self.loc['main'].location_id,
+            'source package': 'hello',
+            'source version': '2.2-2',
+            'size': 0,
+            'md5sum': 'deadbeef',
+            'sha1sum': 'deadbeef',
+            'sha256sum': 'deadbeef'}
+        upload = Upload(pkg)
+        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)
+        self.assertEqual('hello', poolfile.binary.package)
+        self.assertEqual('2.2-2', poolfile.binary.version)
+        self.assertEqual(['sid'], poolfile.binary.suites)
+        self.assertEqual('Mr. Maintainer', poolfile.binary.maintainer.name)
+        self.assertEqual('i386', poolfile.binary.architecture.arch_string)
+        self.assertEqual('deb', poolfile.binary.binarytype)
+        self.assertEqual(self.loc['main'], poolfile.location)
+        self.assertEqual(self.source['hello_2.2-2'], poolfile.binary.source)
+        self.assertEqual(0, poolfile.filesize)
+        self.assertEqual('deadbeef', poolfile.md5sum)
+        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()'
+
+        result = get_suite_version_by_package('hello', 'i386', self.session)
+        self.assertEqual(2, len(result))
+        self.assertTrue(('sid', '2.2-1') in result)
+        result = get_suite_version_by_package('hello', 'amd64', self.session)
+        self.assertEqual(0, len(result))
+        result = get_suite_version_by_package('python-hello', 'i386', self.session)
+        self.assertEqual([('squeeze', '2.2-1')], result)
+        result = get_suite_version_by_package('python-hello', 'amd64', self.session)
+        self.assertEqual([('squeeze', '2.2-1')], result)
+
+    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)
+
+    def test_get_component_by_package_suite(self):
+        'test get_component_by_package_suite()'
+
+        result = get_component_by_package_suite('hello', ['sid'], \
+            session = self.session)
+        self.assertEqual('main', result)
+        result = get_component_by_package_suite('hello', ['hamm'], \
+            session = self.session)
+        self.assertEqual(None, result)
+        result = get_component_by_package_suite('foobar', ['sid'], \
+            session = self.session)
+        self.assertEqual(None, result)
+        # test that the newest version is returend
+        result = get_component_by_package_suite('gnome-hello', ['squeeze'], \
+            session = self.session)
+        self.assertEqual('main', result)
+        result = get_component_by_package_suite('gnome-hello', ['sid'], \
+            session = self.session)
+        self.assertEqual('contrib', result)
+        # test arch_list
+        result = get_component_by_package_suite('hello', ['sid'], \
+            arch_list = ['i386'], session = self.session)
+        self.assertEqual('main', result)
+        result = get_component_by_package_suite('hello', ['sid'], \
+            arch_list = ['amd64'], session = self.session)
+        self.assertEqual(None, result)
+
 if __name__ == '__main__':
     unittest.main()
index a2d7d28b360ca6269d774e34a16b290bd66e5b5a..abfa251171cc52c367aaded3ddb70c5367220d7a 100644 (file)
@@ -21,6 +21,7 @@ Component
 Dir
 {
   Root "tests/fixtures/ftp/";
+  Pool "/srv/ftp-master.debian.org/ftp/pool/";
 };
 
 DB