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

diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index 279d5a0f..249ad81e 100755
--- a/tests/dbtest_packages.py
+++ b/tests/dbtest_packages.py
@@ -102,6 +102,7 @@ class PackageTestCase(DBDakTestCase):
     def setup_poolfiles(self):
         'create some PoolFile objects'
 
+        self.setup_locations()
         self.file = {}
         self.file['hello'] = PoolFile(filename = 'main/h/hello/hello_2.2-2.dsc', \
             location = self.loc['main'], filesize = 0, md5sum = '')
@@ -121,7 +122,7 @@ class PackageTestCase(DBDakTestCase):
 
         somelocation.files.append(somefile)
         '''
-        self.setup_locations()
+
         self.setup_poolfiles()
         location = self.session.query(Location)[0]
         self.assertEqual('/srv/ftp-master.debian.org/ftp/pool/', location.path)
@@ -169,16 +170,21 @@ class PackageTestCase(DBDakTestCase):
     def setup_maintainers(self):
         'create some Maintainer objects'
 
-        self.maintainer = Maintainer(name = 'Mr. Maintainer')
-        self.uploader = Maintainer(name = 'Mrs. Uploader')
-        self.lazyguy = Maintainer(name = 'Lazy Guy')
-        self.session.add_all([self.maintainer, self.uploader, self.lazyguy])
+        self.maintainer = {}
+        self.maintainer['maintainer'] = Maintainer(name = 'Mr. Maintainer')
+        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.source = DBSource(maintainer = self.maintainer,
-            changedby = self.uploader)
+        self.setup_poolfiles()
+        self.source = DBSource(source = 'hello', version = '2.2-2', \
+            maintainer = self.maintainer['maintainer'], \
+            changedby = self.maintainer['uploader'], \
+            poolfile = self.file['hello'], install_date = self.now())
 
     def test_maintainers(self):
         '''
@@ -188,20 +194,22 @@ class PackageTestCase(DBDakTestCase):
         '''
 
         self.setup_maintainers()
-        self.assertEqual('Mr. Maintainer',
-                self.session.query(Maintainer)[0].name)
-        self.assertEqual('Mrs. Uploader',
-                self.session.query(Maintainer)[1].name)
-        self.assertEqual('Lazy Guy',
-                self.session.query(Maintainer)[2].name)
+        maintainer = self.maintainer['maintainer']
+        self.assertEqual(maintainer,
+            self.session.query(Maintainer).get(maintainer.maintainer_id))
+        uploader = self.maintainer['uploader']
+        self.assertEqual(uploader,
+            self.session.query(Maintainer).get(uploader.maintainer_id))
+        lazyguy = self.maintainer['lazyguy']
+        self.assertEqual(lazyguy,
+            self.session.query(Maintainer).get(lazyguy.maintainer_id))
         self.setup_sources()
-        #TODO: needs File and Location
-        #self.assertEqual(self.maintainer.maintains_sources, [self.source])
-        #self.assertEqual(self.maintainer.changed_sources, [])
-        #self.assertEqual(self.uploader.maintains_sources, [])
-        #self.assertEqual(self.uploader.changed_sources, [self.source])
-        #self.assertEqual(self.lazyguy.maintains_sources, [])
-        #self.assertEqual(self.lazyguy.changed_sources, [])
+        self.assertEqual(maintainer.maintains_sources, [self.source])
+        self.assertEqual(maintainer.changed_sources, [])
+        self.assertEqual(uploader.maintains_sources, [])
+        self.assertEqual(uploader.changed_sources, [self.source])
+        self.assertEqual(lazyguy.maintains_sources, [])
+        self.assertEqual(lazyguy.changed_sources, [])
 
 
 if __name__ == '__main__':