X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Fdbtest_packages.py;h=e97253213c38ad8ea4366967a0f1b74329e72659;hb=fa9204359367665156ba36756acda4095864016a;hp=249ad81eabf4c96d7e21df93966e863ac2791c66;hpb=2f142b2bf324aba8fcc74cd1aef5de6fa5b9e49c;p=dak.git

diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index 249ad81e..e9725321 100755
--- a/tests/dbtest_packages.py
+++ b/tests/dbtest_packages.py
@@ -23,21 +23,15 @@ class PackageTestCase(DBDakTestCase):
         # hard code ids for source and all
         self.arch['source'].arch_id = 1
         self.arch['all'].arch_id = 2
-        for _, architecture in self.arch.items():
-            self.session.add(architecture)
-            self.session.flush()
-            self.session.refresh(architecture)
+        self.session.add_all(self.arch.values())
 
     def setup_suites(self):
         "setup a hash of Suite objects in self.suite"
 
         self.suite = {}
         for suite_name in ('lenny', 'squeeze', 'sid'):
-            suite = Suite(suite_name = suite_name, version = '-')
-            self.suite[suite_name] = suite
-            self.session.add(suite)
-            self.session.flush()
-            self.session.refresh(suite)
+            self.suite[suite_name] = Suite(suite_name = suite_name, version = '-')
+        self.session.add_all(self.suite.values())
 
     def setUp(self):
         super(PackageTestCase, self).setUp()
@@ -175,11 +169,11 @@ class PackageTestCase(DBDakTestCase):
         self.maintainer['uploader'] = Maintainer(name = 'Mrs. Uploader')
         self.maintainer['lazyguy'] = Maintainer(name = 'Lazy Guy')
         self.session.add_all(self.maintainer.values())
-        self.session.flush()
 
     def setup_sources(self):
         'create a DBSource object; but it cannot be stored in the DB yet'
 
+        self.setup_maintainers()
         self.setup_poolfiles()
         self.source = DBSource(source = 'hello', version = '2.2-2', \
             maintainer = self.maintainer['maintainer'], \
@@ -193,7 +187,8 @@ class PackageTestCase(DBDakTestCase):
         TODO: add relations to changes_pending_source
         '''
 
-        self.setup_maintainers()
+        self.setup_sources()
+        self.session.flush()
         maintainer = self.maintainer['maintainer']
         self.assertEqual(maintainer,
             self.session.query(Maintainer).get(maintainer.maintainer_id))
@@ -203,7 +198,6 @@ class PackageTestCase(DBDakTestCase):
         lazyguy = self.maintainer['lazyguy']
         self.assertEqual(lazyguy,
             self.session.query(Maintainer).get(lazyguy.maintainer_id))
-        self.setup_sources()
         self.assertEqual(maintainer.maintains_sources, [self.source])
         self.assertEqual(maintainer.changed_sources, [])
         self.assertEqual(uploader.maintains_sources, [])
@@ -211,6 +205,17 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual(lazyguy.maintains_sources, [])
         self.assertEqual(lazyguy.changed_sources, [])
 
+    def test_sources(self):
+        'test relation between DBSource and PoolFile'
+
+        self.setup_sources()
+        poolfile_hello = self.session.query(DBSource)[0].poolfile
+        self.assertEqual(self.file['hello'], poolfile_hello)
+        self.assertEqual(self.source, poolfile_hello.source)
+        poolfile_sl = self.session.query(PoolFile). \
+            filter(PoolFile.filename.like('%/sl/%'))[0]
+        self.assertEqual(None, poolfile_sl.source)
+
 
 if __name__ == '__main__':
     unittest.main()