Merge lp:~michael.nelson/launchpad/ppa-privatisation-test-refactor2 into lp:launchpad

[Michael Nelson]

[Michael Nelson (michael.nelson)]

This is the second branch in a series to refactor soyuz tests after fixing bug 506203.

The MP for the branch that actually fixed the bug is at:

https://code.edge.launchpad.net/~michael.nelson/launchpad/506203-ppa-privatisation-check/+merge/19415

The fix ensures that the privacy of a PPA cannot be altered once it has packages published. Unfortunately most of our test infrastructure does exactly that (switches the privacy to do a few tests and then switches it back).

The complete test breakages are as follows:
http://pastebin.ubuntu.com/378292/

This branch fixes:

bin/test -vv -t TestPPAHtaccessTokenGeneration -t TestFindBuildCandidatePrivatePPA -t CopyPackageTestCase -t TestPPABinaryExpiry -t TestPopulateArchiveScript -t TestPublishDistro

Thanks.

[Guilherme Salgado (salgado)]

Hi Michael,

This is a very nice branch; thanks a lot for changing the tests to rely
on less sample data. I only have a few remarks, but it's good to go.

 review approve code

On Fri, 2010-02-19 at 11:48 +0000, Michael Nelson wrote:
>
> This is the second branch in a series to refactor soyuz tests after
> fixing bug 506203.
>
> The MP for the branch that actually fixed the bug is at:
>
> https://code.edge.launchpad.net/~michael.nelson/launchpad/506203-ppa-privatisation-check/+merge/19415
>
> The fix ensures that the privacy of a PPA cannot be altered once it
> has packages published. Unfortunately most of our test infrastructure
> does exactly that (switches the privacy to do a few tests and then
> switches it back).
>

> === modified file 'lib/lp/buildmaster/tests/test_builder.py'
> --- lib/lp/buildmaster/tests/test_builder.py 2010-02-05 15:06:28 +0000
> +++ lib/lp/buildmaster/tests/test_builder.py 2010-02-19 11:48:25 +0000
> @@ -119,14 +119,22 @@
> build.builder = self.builders[count]
> count += 1
>
> - def setUp(self):
> - """Publish some builds for the test archive."""
> - super(TestFindBuildCandidatePPA, self).setUp()
> + def createPPAs(self):
> + """Helper to create the PPAs for this test.
>
> + This is here only so that it can be overridden for a subsequent
> + private PPA test, privatising the PPA before any packages
> + are published."""
> # Create two PPAs and add some builds to each.

Will the makeArchive() call actually add builds to the PPAs?

> self.ppa_joe = self.factory.makeArchive(name="joesppa")
> self.ppa_jim = self.factory.makeArchive(name="jimsppa")
>
> + def setUp(self):
> + """Publish some builds for the test archive."""
> + super(TestFindBuildCandidatePPA, self).setUp()
> +
> + self.createPPAs()
> +
> self.joe_builds = []
> self.joe_builds.extend(
> self.publisher.getPubSource(
> @@ -183,11 +191,19 @@
> build = getUtility(IBuildSet).getByQueueEntry(next_job)
> self.failUnlessEqual('joesppa', build.archive.name)
>
> +
> +class TestFindBuildCandidatePrivatePPA(TestFindBuildCandidatePPA):
> +
> + def createPPAs(self):
> + """Overridden to ensure that joe's ppa is privatised before any
> + packages are published."""
> + super(TestFindBuildCandidatePrivatePPA, self).createPPAs()
> + self.ppa_joe.private = True
> + self.ppa_joe.buildd_secret = 'sekrit'
> +
> def test_findBuildCandidate_for_private_ppa(self):
> # If a ppa is private it will be able to have parallel builds
> # for the one architecture.
> - self.ppa_joe.private = True
> - self.ppa_joe.buildd_secret = 'sekrit'
> next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
> build = getUtility(IBuildSet).getByQueueEntry(next_job)
> self.failUnlessEqual('joesppa', build.archive.name)
>

> === modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
> --- lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-02-11 06:22:38 +0000
> +++ lib/lp/soyuz...

review: Approve (code)

[Michael Nelson (michael.nelson)]

On Fri, Feb 19, 2010 at 2:06 PM, Guilherme Salgado
<email address hidden> wrote:
> Review: Approve code
> Hi Michael,
>
> This is a very nice branch; thanks a lot for changing the tests to rely
> on less sample data.  I only have a few remarks, but it's good to go.
>

Thanks Guilherme. One note below.

>  review approve code
>
> On Fri, 2010-02-19 at 11:48 +0000, Michael Nelson wrote:
...
>> === modified file 'lib/lp/buildmaster/tests/test_builder.py'
>> --- lib/lp/buildmaster/tests/test_builder.py    2010-02-05 15:06:28 +0000
>> +++ lib/lp/buildmaster/tests/test_builder.py    2010-02-19 11:48:25 +0000
>> @@ -119,14 +119,22 @@
>>                  build.builder = self.builders[count]
>>              count += 1
>>
>> -    def setUp(self):
>> -        """Publish some builds for the test archive."""
>> -        super(TestFindBuildCandidatePPA, self).setUp()
>> +    def createPPAs(self):
>> +        """Helper to create the PPAs for this test.
>>
>> +        This is here only so that it can be overridden for a subsequent
>> +        private PPA test, privatising the PPA before any packages
>> +        are published."""
>>          # Create two PPAs and add some builds to each.
>
> Will the makeArchive() call actually add builds to the PPAs?

Hrm, I'm guessing you reviewed r10333 rather than r10334, as I
actually had to refactor the way that test was setup due to a failure.
You might like to take a look at the diff for r10334. The above
comment is now in the context of the creation and adding of builds.

>
>>          self.ppa_joe = self.factory.makeArchive(name="joesppa")
>>          self.ppa_jim = self.factory.makeArchive(name="jimsppa")
>>
>> +    def setUp(self):
>> +        """Publish some builds for the test archive."""
>> +        super(TestFindBuildCandidatePPA, self).setUp()
>> +
>> +        self.createPPAs()
>> +
>>          self.joe_builds = []
>>          self.joe_builds.extend(
>>              self.publisher.getPubSource(
>> @@ -183,11 +191,19 @@
>>          build = getUtility(IBuildSet).getByQueueEntry(next_job)
>>          self.failUnlessEqual('joesppa', build.archive.name)
>>
>> +
>> +class TestFindBuildCandidatePrivatePPA(TestFindBuildCandidatePPA):
>> +
>> +    def createPPAs(self):
>> +        """Overridden to ensure that joe's ppa is privatised before any
>> +        packages are published."""
>> +        super(TestFindBuildCandidatePrivatePPA, self).createPPAs()
>> +        self.ppa_joe.private = True
>> +        self.ppa_joe.buildd_secret = 'sekrit'
>> +
>>      def test_findBuildCandidate_for_private_ppa(self):
>>          # If a ppa is private it will be able to have parallel builds
>>          # for the one architecture.
>> -        self.ppa_joe.private = True
>> -        self.ppa_joe.buildd_secret = 'sekrit'
>>          next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
>>          build = getUtility(IBuildSet).getByQueueEntry(next_job)
>>          self.failUnlessEqual('joesppa', build.archive.name)
>>
>
>> === modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
>> --- lib/lp/soyuz/scripts/tests/test_populatearchive.py  2010-02-11 06:22:38 +0000
>> +++ lib/lp/soyuz/scripts/tests/test_populat...

[Guilherme Salgado (salgado)]

On Fri, 2010-02-19 at 13:42 +0000, Michael Nelson wrote:
> On Fri, Feb 19, 2010 at 2:06 PM, Guilherme Salgado
> <email address hidden> wrote:
> > Review: Approve code
> > Hi Michael,
> >
> > This is a very nice branch; thanks a lot for changing the tests to rely
> > on less sample data. I only have a few remarks, but it's good to go.
> >
>
> Thanks Guilherme. One note below.
>
> > review approve code
> >
> > On Fri, 2010-02-19 at 11:48 +0000, Michael Nelson wrote:
> ...
> >> === modified file 'lib/lp/buildmaster/tests/test_builder.py'
> >> --- lib/lp/buildmaster/tests/test_builder.py 2010-02-05 15:06:28 +0000
> >> +++ lib/lp/buildmaster/tests/test_builder.py 2010-02-19 11:48:25 +0000
> >> @@ -119,14 +119,22 @@
> >> build.builder = self.builders[count]
> >> count += 1
> >>
> >> - def setUp(self):
> >> - """Publish some builds for the test archive."""
> >> - super(TestFindBuildCandidatePPA, self).setUp()
> >> + def createPPAs(self):
> >> + """Helper to create the PPAs for this test.
> >>
> >> + This is here only so that it can be overridden for a subsequent
> >> + private PPA test, privatising the PPA before any packages
> >> + are published."""
> >> # Create two PPAs and add some builds to each.
> >
> > Will the makeArchive() call actually add builds to the PPAs?
>
> Hrm, I'm guessing you reviewed r10333 rather than r10334, as I
> actually had to refactor the way that test was setup due to a failure.
> You might like to take a look at the diff for r10334. The above
> comment is now in the context of the creation and adding of builds.

Yeah, I've reviewed the diff that was sent by email together with the
m-p notification. I'll file a bug asking for an email to be sent when
there's a new revision added to a branch for with a m-p exists.

Anyway, I've just checked the diff for f10334 and it looks good.

=== modified file 'lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py'
--- lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py	2009-08-27 02:00:29 +0000
+++ lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py	2010-02-26 15:32:18 +0000
@@ -26,21 +26,23 @@
     HtaccessTokenGenerator)
 from lp.soyuz.interfaces.archivesubscriber import (
     ArchiveSubscriberStatus)
-from lp.testing.factory import LaunchpadObjectFactory
+from lp.testing import TestCaseWithFactory
 from lp.testing.mail_helpers import pop_notifications
 from lp.services.mail import stub
 
 
-class TestPPAHtaccessTokenGeneration(unittest.TestCase):
+class TestPPAHtaccessTokenGeneration(TestCaseWithFactory):
     """Test the generate_ppa_htaccess.py script."""
 
     layer = LaunchpadZopelessLayer
     dbuser = config.generateppahtaccess.dbuser
 
     def setUp(self):
-        self.ppa = getUtility(IPersonSet).getByName('cprov').archive
-        self.ppa.private = True
-        self.ppa.buildd_secret = "secret"
+        super(TestPPAHtaccessTokenGeneration, self).setUp()
+        self.owner = self.factory.makePerson(
+            name="joe", displayname="Joe Smith")
+        self.ppa = self.factory.makeArchive(
+            owner=self.owner, name="myppa", private=True)
 
         # "Ubuntu" doesn't have a proper publisher config but Ubuntutest
         # does, so override the PPA's distro here.
@@ -60,7 +62,7 @@
 
     def runScript(self):
         """Run the expiry script.
-        
+
         :return: a tuple of return code, stdout and stderr.
         """
         script = os.path.join(
@@ -148,7 +150,7 @@
         # Generate the passwd file.
         script = self.getScript()
         filename = script.generateHtpasswd(self.ppa, tokens)
-        
+
         # It should be a temp file in the same directory as the intended
         # target file when it's renamed, so that os.rename() won't
         # complain about renaming across file systems.
@@ -159,7 +161,7 @@
         # Read it back in.
         file = open(filename, "r")
         file_contents = file.read().splitlines()
-        
+
         # The first line should be the buildd_secret.
         [user, password] = file_contents[0].split(":", 1)
         self.assertEqual(user, "buildd")
@@ -179,7 +181,7 @@
         # For the names to appear in the order above, the dabatase IDs
         # for the tokens have to be in that order.  (To ensure a
         # consistent ordering)
-        self.assertTrue(tokens[0].id < tokens[1].id) 
+        self.assertTrue(tokens[0].id < tokens[1].id)
 
         os.remove(filename)
 
@@ -237,32 +239,31 @@
         # - All members of a team lose their tokens when a team of a
         #   subscribed team leaves it.
 
-        factory = LaunchpadObjectFactory()
         persons1 = []
         persons2 = []
         name12 = getUtility(IPersonSet).getByName("name12")
-        team1 = factory.makeTeam(owner=name12)
-        team2 = factory.makeTeam(owner=name12)
+        team1 = self.factory.makeTeam(owner=name12)
+        team2 = self.factory.makeTeam(owner=name12)
         for count in range(5):
-            person = factory.makePerson()
+            person = self.factory.makePerson()
             team1.addMember(person, name12)
             persons1.append(person)
-            person = factory.makePerson()
+            person = self.factory.makePerson()
             team2.addMember(person, name12)
             persons2.append(person)
 
         all_persons = persons1 + persons2
 
-        parent_team = factory.makeTeam(owner=name12)
+        parent_team = self.factory.makeTeam(owner=name12)
         # This needs to be forced or TeamParticipation is not updated.
         parent_team.addMember(team2, name12, force_team_add=True)
 
-        promiscuous_person = factory.makePerson()
+        promiscuous_person = self.factory.makePerson()
         team1.addMember(promiscuous_person, name12)
         team2.addMember(promiscuous_person, name12)
         all_persons.append(promiscuous_person)
 
-        lonely_person = factory.makePerson()
+        lonely_person = self.factory.makePerson()
         all_persons.append(lonely_person)
 
         # At this point we have team1, with 5 people in it, team2 with 5
@@ -411,7 +412,7 @@
         # .htpasswd.
         return_code, stdout, stderr = self.runScript()
         self.assertEqual(
-            return_code, 0, "Got a bad return code of %s\nOutput:\n%s" % 
+            return_code, 0, "Got a bad return code of %s\nOutput:\n%s" %
                 (return_code, stderr))
         self.assertTrue(os.path.isfile(htaccess))
         self.assertTrue(os.path.isfile(htpasswd))
@@ -464,7 +465,7 @@
         self.assertEqual(subs[0].status, ArchiveSubscriberStatus.CURRENT)
 
         script = self.getScript()
-        script.blacklist = {'cprov': ['my_other_ppa', 'ppa', 'and_another']}
+        script.blacklist = {'joe': ['my_other_ppa', 'myppa', 'and_another']}
         script.main()
 
         # The tokens will still be deactivated, and subscriptions expired.
@@ -477,7 +478,7 @@
 
     def testSendingCancellationEmail(self):
         """Test that when a token is deactivated, its user gets an email.
-        
+
         The email must contain the right headers and text.
         """
         subs, tokens = self.setupDummyTokens()
@@ -495,10 +496,11 @@
         [email] = pop_notifications()
         self.assertEqual(
             email['Subject'],
-            "PPA access cancelled for PPA for Celso Providelo")
+            "PPA access cancelled for PPA named myppa for Joe Smith")
         self.assertEqual(email['To'], "[e-mail]")
         self.assertEqual(
-            email['From'], "PPA for Celso Providelo <[e-mail]>")
+            email['From'],
+            "PPA named myppa for Joe Smith <[e-mail]>")
         self.assertEqual(email['Sender'], "[e-mail]")
 
         body = email.get_payload()
@@ -508,7 +510,7 @@
             "Launchpad: cancellation of archive access\n"
             "-----------------------------------------\n\n"
             "Your access to the private software archive "
-                "\"PPA for Celso Providelo\",\n"
+                "\"PPA named myppa for Joe\nSmith\", "
             "which is hosted by Launchpad, has been "
                 "cancelled.\n\n"
             "You will now no longer be able to download software from this "
@@ -518,7 +520,7 @@
             "of the archive to verify it.\n\n"
             "You can contact the archive owner by visiting their Launchpad "
                 "page here:\n\n"
-            "<http://launchpad.dev/~cprov>\n\n"
+            "<http://launchpad.dev/~joe>\n\n"
             "If you have any concerns you can contact the Launchpad team by "
                 "emailing\n"
             "[e-mail]\n\n"

=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py	2010-02-05 15:06:28 +0000
+++ lib/lp/buildmaster/tests/test_builder.py	2010-02-26 15:32:18 +0000
@@ -103,7 +103,10 @@
         self.assertEqual('joesppa', build.archive.name)
 
 
-class TestFindBuildCandidatePPA(TestFindBuildCandidateBase):
+class TestFindBuildCandidatePPABase(TestFindBuildCandidateBase):
+
+    ppa_joe_private = False
+    ppa_jim_private = False
 
     def _setBuildsBuildingForArch(self, builds_list, num_builds,
                                   archtag="i386"):
@@ -121,11 +124,13 @@
 
     def setUp(self):
         """Publish some builds for the test archive."""
-        super(TestFindBuildCandidatePPA, self).setUp()
+        super(TestFindBuildCandidatePPABase, self).setUp()
 
         # Create two PPAs and add some builds to each.
-        self.ppa_joe = self.factory.makeArchive(name="joesppa")
-        self.ppa_jim = self.factory.makeArchive(name="jimsppa")
+        self.ppa_joe = self.factory.makeArchive(
+            name="joesppa", private=self.ppa_joe_private)
+        self.ppa_jim = self.factory.makeArchive(
+            name="jimsppa", private=self.ppa_jim_private)
 
         self.joe_builds = []
         self.joe_builds.extend(
@@ -168,6 +173,9 @@
         num_free_builders = len(self.builders) - num_active_builders
         self.assertEqual(num_free_builders, 2)
 
+
+class TestFindBuildCandidatePPA(TestFindBuildCandidatePPABase):
+
     def test_findBuildCandidate_first_build_started(self):
         # A PPA cannot start a build if it would use 80% or more of the
         # builders.
@@ -183,11 +191,14 @@
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('joesppa', build.archive.name)
 
+
+class TestFindBuildCandidatePrivatePPA(TestFindBuildCandidatePPABase):
+
+    ppa_joe_private = True
+
     def test_findBuildCandidate_for_private_ppa(self):
         # If a ppa is private it will be able to have parallel builds
         # for the one architecture.
-        self.ppa_joe.private = True
-        self.ppa_joe.buildd_secret = 'sekrit'
         next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('joesppa', build.archive.name)

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-01-20 15:41:25 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-02-26 15:32:18 +0000
@@ -1225,7 +1225,7 @@
         self.assertEqual(num_bin_pub + 4, num_bin_pub_after)
 
 
-class CopyPackageTestCase(TestCase):
+class CopyPackageTestCase(TestCaseWithFactory):
     """Test the CopyPackageHelper class."""
     layer = LaunchpadZopelessLayer
     dbuser = config.archivepublisher.dbuser
@@ -2148,30 +2148,31 @@
     def testCopyFromPrivateToPublicPPAs(self):
         """Copies from private to public archives are allowed."""
         # Set up a private PPA.
-        cprov = getUtility(IPersonSet).getByName("cprov")
-        cprov.archive.buildd_secret = "secret"
-        cprov.archive.private = True
+        joe = self.factory.makePerson(name="joe")
+        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+        joe_private_ppa = self.factory.makeArchive(
+            owner=joe, name='ppa', private=True,
+            distribution=ubuntu)
 
         # Create a source and binary private publication.
-        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         hoary = ubuntu.getSeries('hoary')
         test_publisher = self.getTestPublisher(hoary)
         ppa_source = test_publisher.getPubSource(
-            archive=cprov.archive, version='1.0', distroseries=hoary)
+            archive=joe_private_ppa, version='1.0', distroseries=hoary)
         ppa_binaries = test_publisher.getPubBinaries(
             pub_source=ppa_source, distroseries=hoary)
         self.layer.txn.commit()
 
         # Run the copy package script storing the logged information.
         copy_helper = self.getCopier(
-            sourcename='foo', from_ppa='cprov', include_binaries=True,
-            from_suite='hoary', to_suite='hoary')
+            sourcename='foo', from_ppa='joe',
+            include_binaries=True, from_suite='hoary', to_suite='hoary')
         copied = copy_helper.mainTask()
 
         # The private files are copied via a delayed-copy request.
         self.assertEqual(len(copied), 1)
         self.assertEqual(
-            ['INFO: FROM: cprov: hoary-RELEASE',
+            ['INFO: FROM: joe: hoary-RELEASE',
              'INFO: TO: Primary Archive for Ubuntu Linux: hoary-RELEASE',
              'INFO: Copy candidates:',
              'INFO: \tfoo 1.0 in hoary',
@@ -2186,23 +2187,24 @@
     def testUnembargoing(self):
         """Test UnembargoSecurityPackage, which wraps PackagerCopier."""
         # Set up a private PPA.
-        cprov = getUtility(IPersonSet).getByName("cprov")
-        cprov.archive.buildd_secret = "secret"
-        cprov.archive.private = True
+        joe = self.factory.makePerson(name="joe")
+        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+        joe_private_ppa = self.factory.makeArchive(
+            owner=joe, name='ppa', private=True,
+            distribution=ubuntu)
 
         # Setup a SoyuzTestPublisher object, so we can create publication
         # to be unembargoed.
-        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         warty = ubuntu.getSeries('warty')
         test_publisher = self.getTestPublisher(warty)
 
         # Create a source and binary pair to be unembargoed from the PPA.
         ppa_source = test_publisher.getPubSource(
-            archive=cprov.archive, version='1.1',
+            archive=joe_private_ppa, version='1.1',
             distroseries=warty,
             status=PackagePublishingStatus.PUBLISHED)
         other_source = test_publisher.getPubSource(
-            archive=cprov.archive, version='1.1',
+            archive=joe_private_ppa, version='1.1',
             sourcename="sourcefordiff", distroseries=warty,
             status=PackagePublishingStatus.PUBLISHED)
         test_publisher.addFakeChroots(warty)
@@ -2214,7 +2216,7 @@
         sourcepackagerelease = other_source.sourcepackagerelease
         diff_file = test_publisher.addMockFile("diff_file", restricted=True)
         package_diff = sourcepackagerelease.requestDiffTo(
-            cprov, ppa_source.sourcepackagerelease)
+            joe, ppa_source.sourcepackagerelease)
         package_diff.diff_content = diff_file
 
         # Prepare a *restricted* buildlog file for the Build instances.
@@ -2245,7 +2247,7 @@
 
         # Now we can invoke the unembargo script and check its results.
         test_args = [
-            "--ppa", "cprov",
+            "--ppa", "joe",
             "--ppa-name", "ppa",
             "-s", "%s" % ppa_source.distroseries.name + "-security",
             "foo"

=== modified file 'lib/lp/soyuz/scripts/tests/test_expire_ppa_bins.py'
--- lib/lp/soyuz/scripts/tests/test_expire_ppa_bins.py	2010-01-17 09:15:43 +0000
+++ lib/lp/soyuz/scripts/tests/test_expire_ppa_bins.py	2010-02-26 15:32:18 +0000
@@ -4,22 +4,24 @@
 """Test the expire-ppa-binaries.py script. """
 
 import pytz
+
+from datetime import datetime, timedelta
+
 import unittest
 
-from datetime import datetime, timedelta
-
 from zope.component import getUtility
 
 from canonical.config import config
+from canonical.launchpad.scripts import QuietFakeLogger
+from canonical.testing.layers import LaunchpadZopelessLayer
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
-from canonical.launchpad.scripts import QuietFakeLogger
 from lp.soyuz.scripts.expire_ppa_binaries import PPABinaryExpirer
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
-from canonical.testing.layers import LaunchpadZopelessLayer
-
-
-class TestPPABinaryExpiry(unittest.TestCase):
+from lp.testing import TestCaseWithFactory
+
+
+class TestPPABinaryExpiry(TestCaseWithFactory):
     """Test the expire-ppa-binaries.py script."""
 
     layer = LaunchpadZopelessLayer
@@ -41,6 +43,7 @@
 
     def setUp(self):
         """Set up some test publications."""
+        super(TestPPABinaryExpiry, self).setUp()
         # Configure the test publisher.
         self.layer.switchDbUser("launchpad")
         self.stp = SoyuzTestPublisher()
@@ -52,10 +55,8 @@
         self.over_threshold_date = self.now - timedelta(days=31)
 
         # Prepare two PPAs for the tests to use.
-        cprov = getUtility(IPersonSet).getByName('cprov')
-        self.ppa = cprov.archive
-        mark = getUtility(IPersonSet).getByName('mark')
-        self.ppa2 = mark.archive
+        self.ppa = self.factory.makeArchive()
+        self.ppa2 = self.factory.makeArchive()
 
     def getScript(self, test_args=None):
         """Return a PPABinaryExpirer instance."""
@@ -209,9 +210,9 @@
 
     def testBlacklistingWorks(self):
         """Test that blacklisted PPAs are not expired."""
-        source, binary = self._setUpExpirablePublications()
+        source, binary = self._setUpExpirablePublications(archive=self.ppa)
         script = self.getScript()
-        script.blacklist = ["cprov",]
+        script.blacklist = [self.ppa.owner.name, ]
         self.layer.txn.commit()
         self.layer.switchDbUser(self.dbuser)
         script.main()

=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-02-11 06:22:38 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-02-26 15:32:18 +0000
@@ -29,7 +29,7 @@
 from lp.soyuz.scripts.ftpmaster import PackageLocationError, SoyuzScriptError
 from lp.soyuz.scripts.populate_archive import ArchivePopulator
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
-from lp.testing import TestCase
+from lp.testing import TestCaseWithFactory
 
 
 def get_spn(build):
@@ -38,7 +38,7 @@
     return pub.sourcepackagerelease.sourcepackagename
 
 
-class TestPopulateArchiveScript(TestCase):
+class TestPopulateArchiveScript(TestCaseWithFactory):
     """Test the copy-package.py script."""
 
     layer = LaunchpadZopelessLayer
@@ -542,7 +542,7 @@
 
         This test should provoke a `SoyuzScriptError` exception because the
         copy archive does not exist yet and will need to be created.
-        
+
         This is different from a merge copy scenario where the destination
         copy archive exists already and hence no archive creation reason is
         needed.
@@ -690,20 +690,17 @@
         The copying of packages from private archives to public ones
         thus constitutes a security breach.
         """
-        # We will make cprov's PPA private and then attempt to copy from it.
-        cprov = getUtility(IPersonSet).getByName('cprov')
-        ppa = cprov.archive
-        ppa.buildd_secret = 'super-secret-123'
-        ppa.private = True
+        # We will make a private PPA and then attempt to copy from it.
+        joe = self.factory.makePerson(name='joe')
+        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+        joes_private_ppa = self.factory.makeArchive(
+            owner=joe, private=True, name="ppa", distribution=ubuntu)
 
-        extra_args = ['--from-user', 'cprov', '-a', 'amd64']
+        extra_args = ['--from-user', 'joe', '-a', 'amd64']
         copy_archive = self.runScript(
             extra_args=extra_args, exception_type=SoyuzScriptError,
             exception_text=(
-                "Cannot copy from private archive ('cprov/ppa')"))
-
-        ppa.private = False
-        ppa.buildd_secret = None
+                "Cannot copy from private archive ('joe/ppa')"))
 
     def testDisabledDestinationArchive(self):
         """Try copying to a disabled archive.

=== modified file 'lib/lp/soyuz/scripts/tests/test_publishdistro.py'
--- lib/lp/soyuz/scripts/tests/test_publishdistro.py	2010-02-25 12:30:49 +0000
+++ lib/lp/soyuz/scripts/tests/test_publishdistro.py	2010-02-26 15:32:18 +0000
@@ -239,17 +239,15 @@
 
         It should only publish private PPAs.
         """
-        # First, we'll make cprov's archive private.
+        # First, we'll make a private PPA and populate it with a
+        # publishing record.
         ubuntutest = getUtility(IDistributionSet)['ubuntutest']
-        cprov = getUtility(IPersonSet).getByName('cprov')
-        cprov_ppa = removeSecurityProxy(cprov.archive)
-        cprov_ppa.private = True
-        cprov_ppa.buildd_secret = "secret"
-        cprov_ppa.distribution = self.ubuntutest
+        private_ppa = self.factory.makeArchive(
+            private=True, distribution=ubuntutest)
 
-        # Publish something to cprov's PPA:
+        # Publish something to the private PPA:
         pub_source =  self.getPubSource(
-            sourcename='baz', filecontent='baz', archive=cprov.archive)
+            sourcename='baz', filecontent='baz', archive=private_ppa)
         self.layer.txn.commit()
 
         # Try a plain PPA run, to ensure the private one is NOT published.

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-02-24 23:16:07 +0000
+++ lib/lp/testing/factory.py	2010-02-26 15:32:18 +0000
@@ -145,7 +145,7 @@
 @@ -121,6 +121,10 @@
                  'Gur pbasyvpgf grkg qrfpevovat nal cngu be grkg pbasyvpgf.'),
               ernqbayl=Gehr))
- 
+
 +    unf_pbasyvpgf = Obby(
 +        gvgyr=_('Unf pbasyvpgf'), ernqbayl=Gehr,
 +        qrfpevcgvba=_('Gur cerivrjrq zretr cebqhprf pbasyvpgf.'))
@@ -1558,7 +1558,7 @@
         return getUtility(IComponentSet).ensure(name)
 
     def makeArchive(self, distribution=None, owner=None, name=None,
-                    purpose=None, enabled=True):
+                    purpose=None, enabled=True, private=False):
         """Create and return a new arbitrary archive.
 
         :param distribution: Supply IDistribution, defaults to a new one
@@ -1586,10 +1586,16 @@
         if purpose == ArchivePurpose.PRIMARY:
             return distribution.main_archive
 
-        return getUtility(IArchiveSet).new(
+        archive = getUtility(IArchiveSet).new(
             owner=owner, purpose=purpose,
             distribution=distribution, name=name, enabled=enabled)
 
+        if private:
+            archive.private = True
+            archive.buildd_secret = "sekrit"
+
+        return archive
+
     def makeBuilder(self, processor=None, url=None, name=None, title=None,
                     description=None, owner=None, active=True,
                     virtualized=True, vm_host=None):