[dak/master] Test and Improve source_exists().
Signed-off-by: Torsten Werner <twerner@debian.org>
---
daklib/dbconn.py | 25 +++++++++----------------
daklib/queue.py | 10 +++++++---
tests/dbtest_packages.py | 25 ++++++++++++++++++++++++-
3 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 9c1ed2b..9ace924 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2115,10 +2115,14 @@ def source_exists(source, source_version, suites = ["any"], session=None):
"""
cnf = Config()
- ret = 1
+ ret = True
+
+ from daklib.regexes import re_bin_only_nmu
+ orig_source_version = re_bin_only_nmu.sub('', source_version)
for suite in suites:
- q = session.query(DBSource).filter_by(source=source)
+ q = session.query(DBSource).filter_by(source=source). \
+ filter(DBSource.version.in_([source_version, orig_source_version]))
if suite != "any":
# source must exist in suite X, or in some other suite that's
# mapped to X, recursively... silent-maps are counted too,
@@ -2133,24 +2137,13 @@ def source_exists(source, source_version, suites = ["any"], session=None):
if x[1] in s and x[0] not in s:
s.append(x[0])
- q = q.join(SrcAssociation).join(Suite)
- q = q.filter(Suite.suite_name.in_(s))
-
- # Reduce the query results to a list of version numbers
- ql = [ j.version for j in q.all() ]
-
- # Try (1)
- if source_version in ql:
- continue
+ q = q.filter(DBSource.suites.any(Suite.suite_name.in_(s)))
- # Try (2)
- from daklib.regexes import re_bin_only_nmu
- orig_source_version = re_bin_only_nmu.sub('', source_version)
- if orig_source_version in ql:
+ if q.count() > 0:
continue
# No source found so return not ok
- ret = 0
+ ret = False
return ret
diff --git a/daklib/queue.py b/daklib/queue.py
index 7a49242..ab688bf 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -795,7 +795,8 @@ class Upload(object):
(source_version, f, self.pkg.changes["version"]))
else:
# Check in the SQL database
- if not source_exists(source_package, source_version, self.pkg.changes["distribution"].keys(), session):
+ if not source_exists(source_package, source_version, suites = \
+ self.pkg.changes["distribution"].keys(), session = session):
# Check in one of the other directories
source_epochless_version = re_no_epoch.sub('', source_version)
dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
@@ -2681,7 +2682,8 @@ distribution."""
source_version = entry["source version"]
source_package = entry["source package"]
if not self.pkg.changes["architecture"].has_key("source") \
- and not source_exists(source_package, source_version, self.pkg.changes["distribution"].keys(), session):
+ and not source_exists(source_package, source_version, \
+ suites = self.pkg.changes["distribution"].keys(), session = session):
source_epochless_version = re_no_epoch.sub('', source_version)
dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
found = False
@@ -2728,7 +2730,9 @@ distribution."""
source_version = entry["source version"]
source_package = entry["source package"]
if not self.pkg.changes["architecture"].has_key("source") \
- and not source_exists(source_package, source_version, self.pkg.changes["distribution"].keys()):
+ and not source_exists(source_package, source_version, \
+ suites = self.pkg.changes["distribution"].keys(), \
+ session = session):
self.rejects.append("no source found for %s %s (%s)." % (source_package, source_version, checkfile))
# Version and file overwrite checks
diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index 732cccc..8fd7ad1 100755
--- a/tests/dbtest_packages.py
+++ b/tests/dbtest_packages.py
@@ -5,7 +5,7 @@ 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
+ get_suites_source_in, add_dsc_to_db, source_exists
from sqlalchemy.orm.exc import MultipleResultsFound
import unittest
@@ -320,6 +320,29 @@ class PackageTestCase(DBDakTestCase):
self.assertEqual(None, dsc_location_id)
self.assertEqual([], pfs)
+ def test_source_exists(self):
+ 'test function source_exists()'
+
+ self.setup_sources()
+ self.session.flush()
+ hello = self.source['hello']
+ 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))
+
if __name__ == '__main__':
unittest.main()
--
1.5.6.5
Reply to: