Merge branch 'master' into dbtests

[dak.git] / tests / dbtest_packages.py

diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index fabb4152ff1672680e0e4d6a399cf70d5fa3cc1c..0f5f6e88fdd7762d12cb446c5dbecaada46338f0 100755 (executable)
--- a/tests/dbtest_packages.py
+++ b/tests/dbtest_packages.py
@@ -7,6 +7,7 @@ from daklib.dbconn import Architecture, Suite, get_suite_architectures, \
     check_poolfile, get_poolfile_like_name, get_source_in_suite, \
     get_suites_source_in, add_dsc_to_db, source_exists
 from daklib.queue_install import package_to_suite
+from daklib.queue import get_newest_source, get_suite_version
 
 from sqlalchemy.orm.exc import MultipleResultsFound
 import unittest
@@ -348,7 +349,6 @@ class PackageTestCase(DBDakTestCase):
         'test function package_to_suite()'
 
         self.setup_sources()
-        self.session.flush()
         pkg = Pkg()
         pkg.changes = { 'distribution': {} }
         upload = Upload(pkg)
@@ -368,6 +368,27 @@ class PackageTestCase(DBDakTestCase):
         pkg.changes['distribution'] = { 'lenny': '' }
         self.assertTrue(package_to_suite(upload, 'lenny', self.session))
 
+    def test_get_newest_source(self):
+        'test function get_newest_source()'
+
+        self.setup_sources()
+        import daklib.queue
+        daklib.queue.dm_suites = ['sid']
+        self.assertEqual(self.source['hello'], 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()'
+
+        self.setup_sources()
+        result = get_suite_version('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)
+        self.assertEqual(2, len(result))
+        self.assertTrue(('squeeze', '3.03-16') in result)
+        self.assertTrue(('sid', '3.03-16') in result)
 
 if __name__ == '__main__':
     unittest.main()