Merge lp:~stevenk/launchpad/copies-into-derived-series-fix into lp:launchpad

[Steve Kowalik]

[r=jtv][bug=787904] Allow copies into derived series using the copy-package.py db user.

While QAing other work yesterday, I tripped over this. Add a test to make sure we can copy into a derived series, and give archivepublisher permission to SELECT from distroseriesparent.

[Jeroen T. Vermeulen (jtv)]

One note: my only hint about what the test is specifically good for is in this MP. Could you rename the test and/or add a comment to say not what kind of scenario the test goes through, but what fact the test is meant to establish?

review: Approve (code)

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2011-05-19 14:14:36 +0000
+++ database/schema/security.cfg	2011-05-25 03:42:33 +0000
@@ -834,6 +834,7 @@
 public.cve                              = SELECT, INSERT
 public.distributionjob                  = SELECT, INSERT, DELETE
 public.distributionsourcepackage        = SELECT, INSERT, UPDATE
+public.distroseriesparent               = SELECT
 public.flatpackagesetinclusion          = SELECT, INSERT, UPDATE, DELETE
 public.gpgkey                           = SELECT, INSERT, UPDATE
 public.job                              = SELECT, INSERT, UPDATE

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-05-23 10:18:53 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-05-25 03:42:33 +0000
@@ -1364,6 +1364,19 @@
         self.assertComponentSectionAndPriority(
             main, bin_hppa, copied_bin_hppa)
 
+    def test_copy_into_derived_series(self):
+        # We are able to successfully copy into a derived series.
+        archive = self.test_publisher.ubuntutest.main_archive
+        source = self.test_publisher.getPubSource(
+            archive=archive, version='1.0-2', architecturehintlist='any')
+        dsp = self.factory.makeDistroSeriesParent()
+        target_archive = dsp.derived_series.main_archive
+        self.layer.txn.commit()
+        self.layer.switchDbUser('archivepublisher')
+        # The real test is that the doCopy doesn't fail.
+        [copied_source] = self.doCopy(
+            source, target_archive, dsp.derived_series, source.pocket, False)
+
 
 class TestDoDelayedCopy(TestCaseWithFactory, BaseDoCopyTests):