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

diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index c35123ce..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)
@@ -179,8 +180,11 @@ class PackageTestCase(DBDakTestCase):
     def setup_sources(self):
         'create a DBSource object; but it cannot be stored in the DB yet'
 
-        self.source = DBSource(maintainer = self.maintainer['maintainer'],
-            changedby = self.maintainer['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):
         '''
@@ -200,13 +204,12 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual(lazyguy,
             self.session.query(Maintainer).get(lazyguy.maintainer_id))
         self.setup_sources()
-        #TODO: needs File and Location
-        #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, [])
+        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__':