Merge lp:~james-w/launchpad/no-more-sampledata-0 into lp:launchpad

[James Westby]

Hi,

This changes a bunch of soyuz tests to not use the sampledata.

It goes a bit further than that in that it restructures them to
have less setup and to create the things they need using the
factory rather than SoyuzTestPublisher.

In addition I moved some other code that is too deeply buried
right now in to lp.testing.sampledata, and extended the factory
with some new methods to satisfy the needs of the changed code.

Thanks,

James

[Jonathan Lange (jml)]

On Sun, Aug 1, 2010 at 12:06 AM, James Westby <email address hidden> wrote:
> James Westby has proposed merging lp:~james-w/launchpad/no-more-sampledata-0 into lp:launchpad/devel.
>
> Requested reviews:
>  Launchpad code reviewers (launchpad-reviewers)
>
>
> Hi,
>
> This changes a bunch of soyuz tests to not use the sampledata.
>

Woot.

> It goes a bit further than that in that it restructures them to
> have less setup and to create the things they need using the
> factory rather than SoyuzTestPublisher.
>
> In addition I moved some other code that is too deeply buried
> right now in to lp.testing.sampledata, and extended the factory
> with some new methods to satisfy the needs of the changed code.
>
> Thanks,
>

Thank you.

The review below mostly picks up on some naming standard glitches and
points out some things that could be improved in the soyuz tests
(rather than in your changes). However, I've also got a couple of
questions about your changes and would very much appreciate hearing
back from you.

I also feel a little guilty about making so many petty comments when
you've done such a helpful thing. Please do not feel obliged to act on
all of my suggestions.

jml

> === modified file 'lib/lp/soyuz/tests/ppa.py'
> --- lib/lp/soyuz/tests/ppa.py   2010-03-11 16:48:37 +0000
> +++ lib/lp/soyuz/tests/ppa.py   2010-07-31 23:06:48 +0000
> @@ -25,6 +25,10 @@
>  from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
>  from lp.soyuz.interfaces.publishing import (
>     PackagePublishingPriority, PackagePublishingStatus)
> +from lp.testing.sampledata import (
> +    HOARY_DISTROSERIES_NAME, I386_ARCHITECTURE_NAME, MAIN_COMPONENT_NAME,
> +    MOZILLA_FIREFOX_SOURCEPACKAGENAME, MOZILLA_FIREFOX_SOURCEPACKAGEVERSION,
> +    NAME16_PERSON_NAME, UBUNTU_TEAM_NAME)
>

I'm very glad you've started putting things in the sampledata module.

Would it be possible to change these names to clarify the intent
behind their use?

For example, NAME16_PERSON_NAME tells me nothing about the person
object, and when I see it in a test, I don't know why name16 was
chosen instead of name15. UBUNTU_TEAM_MEMBER_NAME might be better.
Likewise, it would be good to have intent-revealing names for the
FIREFOX constants and the HOARY constants.

> === modified file 'lib/lp/soyuz/tests/soyuz.py'
> --- lib/lp/soyuz/tests/soyuz.py 2010-02-08 11:40:06 +0000
> +++ lib/lp/soyuz/tests/soyuz.py 2010-07-31 23:06:48 +0000
> @@ -27,14 +27,19 @@
>  from lp.soyuz.model.publishing import (
>     SourcePackagePublishingHistory,
>     BinaryPackagePublishingHistory)
> +from lp.testing.sampledata import (
> +    CHROOT_LFA, CPROV_NAME, I386_ARCHITECTURE_NAME, LAUNCHPAD_DBUSER_NAME,
> +    UBUNTU_DISTRIBUTION_NAME, WARTY_DISTROSERIES_NAME,
> +    WARTY_UPDATES_SUITE_NAME)
>

Ditto CPROV, LAUNCHPAD_DBUSER_NAME and WARTY_*

> === modified file 'lib/lp/soyuz/tests/test_archive.py'
> --- lib/lp/soyuz/tests/test_archive.py  2010-07-21 07:45:50 +0000
> +++ lib/lp/soyuz/tests/test_archive.py  2010-07-31 23:06:48 +0000
...
> @@ -42,118 +41,110 @@
>
>  class TestGetPublicationsInArchive(TestCaseWithFactory):
>
> -    layer = LaunchpadZopelessLayer
> -
> -    def setUp(self):
> -    ...

[Jonathan Lange (jml)]

As per my comments via email.

review: Needs Fixing

[James Westby (james-w)]

> The review below mostly picks up on some naming standard glitches and
> points out some things that could be improved in the soyuz tests
> (rather than in your changes). However, I've also got a couple of
> questions about your changes and would very much appreciate hearing
> back from you.
>
> I also feel a little guilty about making so many petty comments when
> you've done such a helpful thing. Please do not feel obliged to act on
> all of my suggestions.

Thanks for the review. The intent is to improve the understandability
of the tests, so your suggestions are helpful.

> > === modified file 'lib/lp/soyuz/tests/ppa.py'
> > --- lib/lp/soyuz/tests/ppa.py   2010-03-11 16:48:37 +0000
> > +++ lib/lp/soyuz/tests/ppa.py   2010-07-31 23:06:48 +0000
> > @@ -25,6 +25,10 @@
> >  from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
> >  from lp.soyuz.interfaces.publishing import (
> >     PackagePublishingPriority, PackagePublishingStatus)
> > +from lp.testing.sampledata import (
> > +    HOARY_DISTROSERIES_NAME, I386_ARCHITECTURE_NAME, MAIN_COMPONENT_NAME,
> > +    MOZILLA_FIREFOX_SOURCEPACKAGENAME,
> MOZILLA_FIREFOX_SOURCEPACKAGEVERSION,
> > +    NAME16_PERSON_NAME, UBUNTU_TEAM_NAME)
> >
>
> I'm very glad you've started putting things in the sampledata module.
>
> Would it be possible to change these names to clarify the intent
> behind their use?
>
> For example, NAME16_PERSON_NAME tells me nothing about the person
> object, and when I see it in a test, I don't know why name16 was
> chosen instead of name15. UBUNTU_TEAM_MEMBER_NAME might be better.
> Likewise, it would be good to have intent-revealing names for the
> FIREFOX constants and the HOARY constants.

I can do that, but it will require some research. It's one of the
problems with sampledata that I don't know what the intent is.

> My comment about the other error message applies here. I think it can
> be dropped. (If archives have unhelpful __repr__ implementations, we
> should fix that rather than working around it all the time in tests).

They have the default repr, should we change that?

> Hmm. These assertions look very much like the ones previous. Is there
> a domain-specific assertion method or Matcher to be had here?

Probably, I'll take a look. I think there's only two uses, so it hadn't
hit my refactoring threshold yet.

> I think this one needs a comment. What's an LFA?

LibraryFileAlias, I thought it was standard parlance, should I expand the
variable name instead?

Thanks,

James

[Jonathan Lange (jml)]

On Mon, Aug 2, 2010 at 2:25 PM, James Westby <email address hidden> wrote:
...
>> > === modified file 'lib/lp/soyuz/tests/ppa.py'
>> > --- lib/lp/soyuz/tests/ppa.py   2010-03-11 16:48:37 +0000
>> > +++ lib/lp/soyuz/tests/ppa.py   2010-07-31 23:06:48 +0000
>> > @@ -25,6 +25,10 @@
>> >  from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
>> >  from lp.soyuz.interfaces.publishing import (
>> >     PackagePublishingPriority, PackagePublishingStatus)
>> > +from lp.testing.sampledata import (
>> > +    HOARY_DISTROSERIES_NAME, I386_ARCHITECTURE_NAME, MAIN_COMPONENT_NAME,
>> > +    MOZILLA_FIREFOX_SOURCEPACKAGENAME,
>> MOZILLA_FIREFOX_SOURCEPACKAGEVERSION,
>> > +    NAME16_PERSON_NAME, UBUNTU_TEAM_NAME)
>> >
>>
>> I'm very glad you've started putting things in the sampledata module.
>>
>> Would it be possible to change these names to clarify the intent
>> behind their use?
>>
>> For example, NAME16_PERSON_NAME tells me nothing about the person
>> object, and when I see it in a test, I don't know why name16 was
>> chosen instead of name15. UBUNTU_TEAM_MEMBER_NAME might be better.
>> Likewise, it would be good to have intent-revealing names for the
>> FIREFOX constants and the HOARY constants.
>
> I can do that, but it will require some research. It's one of the
> problems with sampledata that I don't know what the intent is.
>

At the very least make the UBUNTU_TEAM_MEMBER_NAME change and add some comments.

I don't want to make you spend a whole heap of time figuring out why
all of this stuff gets used. However, I'm also a little worried that
the trend will continue. Perhaps we could work a little to avoid the
risk by adding some comments or something. I don't know.

>> My comment about the other error message applies here. I think it can
>> be dropped. (If archives have unhelpful __repr__ implementations, we
>> should fix that rather than working around it all the time in tests).
>
> They have the default repr, should we change that?
>

Don't bother. Someone else can when it comes time to actually debug.

>> Hmm. These assertions look very much like the ones previous. Is there
>> a domain-specific assertion method or Matcher to be had here?
>
> Probably, I'll take a look. I think there's only two uses, so it hadn't
> hit my refactoring threshold yet.
>

Yeah, maybe it's not needed.

>> I think this one needs a comment. What's an LFA?
>
> LibraryFileAlias, I thought it was standard parlance, should I expand the
> variable name instead?
>

Hmm, maybe it is. I don't do much with the librarian.

I have no strong opinion about the rename. Follow your heart.

cheers,
jml

[James Westby (james-w)]

Hi,

I have made all the requested changes.

I went a little further than necessary and created some matchers
rather than new assertion methods.

Thanks,

James

[James Westby (james-w)]

I tried to rename the sampledata variables as best I could, but for things
like "hoary", it just means "one bag of stuff as opposed to 'warty' which
is a different bag of stuff."

Thanks,

James

[Robert Collins (lifeless)]

Something that stood out to me, and perhaps jml's review mentions this
is that your new factory methods don't seem to have tests?

-Rob

[James Westby (james-w)]

On Mon, 02 Aug 2010 20:01:40 -0000, Robert Collins <email address hidden> wrote:
> Something that stood out to me, and perhaps jml's review mentions this
> is that your new factory methods don't seem to have tests?

It did, and they do now.

Thanks,

James

[Jonathan Lange (jml)]

Awesome. Thanks so much.

review: Approve

=== modified file 'lib/lp/soyuz/tests/ppa.py'
--- lib/lp/soyuz/tests/ppa.py	2010-03-11 16:48:37 +0000
+++ lib/lp/soyuz/tests/ppa.py	2010-08-04 00:47:45 +0000
@@ -25,6 +25,10 @@
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.publishing import (
     PackagePublishingPriority, PackagePublishingStatus)
+from lp.testing.sampledata import (
+    HOARY_DISTROSERIES_NAME, I386_ARCHITECTURE_NAME, MAIN_COMPONENT_NAME,
+    UBUNTU_DEVELOPER_ADMIN_NAME, UBUNTU_UPLOAD_TEAM_NAME,
+    WARTY_ONLY_SOURCEPACKAGENAME, WARTY_ONLY_SOURCEPACKAGEVERSION)
 
 
 def publishToTeamPPA(team_name=None, distroseries_name=None,
@@ -40,15 +44,16 @@
     The team PPA must already be created.
     """
     if team_name is None:
-        team_name = "ubuntu-team"
+        team_name = UBUNTU_UPLOAD_TEAM_NAME
     if team_member_name is None:
-        team_member_name = "name16"
+        team_member_name = UBUNTU_DEVELOPER_ADMIN_NAME
     team = getUtility(IPersonSet).getByName(team_name)
     _publishToPPA(
         team.archive, team_member_name, distroseries_name,
         sourcepackage_name, sourcepackage_version, distribution_name,
         binarypackage_version, publishing_status, arch)
 
+
 def publishToPPA(person_name, distroseries_name=None, sourcepackage_name=None,
                  sourcepackage_version=None, distribution_name=None,
                  binarypackage_version=None, publishing_status=None,
@@ -59,6 +64,7 @@
                   distribution_name, binarypackage_version, publishing_status,
                   arch)
 
+
 def _publishToPPA(archive, person_name, distroseries_name, sourcepackage_name,
                   sourcepackage_version, distribution_name,
                   binarypackage_version, publishing_status, arch):
@@ -67,15 +73,15 @@
     else:
         distribution = getUtility(IDistributionSet)[distribution_name]
     if distroseries_name is None:
-        distroseries_name = "hoary"
+        distroseries_name = HOARY_DISTROSERIES_NAME
     if sourcepackage_name is None:
-        sourcepackage_name = "mozilla-firefox"
+        sourcepackage_name = WARTY_ONLY_SOURCEPACKAGENAME
     if sourcepackage_version is None:
-        sourcepackage_version = "0.9"
+        sourcepackage_version = WARTY_ONLY_SOURCEPACKAGEVERSION
     if publishing_status is None:
         publishing_status = PackagePublishingStatus.PENDING
     if arch is None:
-        arch = "i386"
+        arch = I386_ARCHITECTURE_NAME
 
     sourcepackagename = getUtility(ISourcePackageNameSet)[sourcepackage_name]
     distroseries = distribution[distroseries_name]
@@ -88,7 +94,7 @@
         # XXX: kiko 2007-10-25: oy, what a hack. I need to test with cprov
         # and he doesn't have a signing key in the database
         sourcepackagerelease.dscsigningkey = person.gpg_keys[0]
-    main_component = getUtility(IComponentSet)['main']
+    main_component = getUtility(IComponentSet)[MAIN_COMPONENT_NAME]
     SourcePackagePublishingHistory(
         distroseries=distroseries,
         sourcepackagerelease=sourcepackagerelease,

=== modified file 'lib/lp/soyuz/tests/soyuz.py'
--- lib/lp/soyuz/tests/soyuz.py	2010-02-08 11:40:06 +0000
+++ lib/lp/soyuz/tests/soyuz.py	2010-08-04 00:47:45 +0000
@@ -27,14 +27,19 @@
 from lp.soyuz.model.publishing import (
     SourcePackagePublishingHistory,
     BinaryPackagePublishingHistory)
+from lp.testing.sampledata import (
+    BUILDD_ADMIN_USERNAME, CHROOT_LIBRARYFILEALIAS, I386_ARCHITECTURE_NAME,
+    LAUNCHPAD_DBUSER_NAME, UBUNTU_DISTRIBUTION_NAME, WARTY_DISTROSERIES_NAME,
+    WARTY_UPDATES_SUITE_NAME)
 
 
 class SoyuzTestHelper:
     """Helper class to support easier tests in Soyuz component."""
 
     def __init__(self):
-        self.ubuntu = getUtility(IDistributionSet)['ubuntu']
-        self.cprov_archive = getUtility(IPersonSet).getByName('cprov').archive
+        self.ubuntu = getUtility(IDistributionSet)[UBUNTU_DISTRIBUTION_NAME]
+        self.cprov_archive = getUtility(
+            IPersonSet).getByName(BUILDD_ADMIN_USERNAME).archive
 
     @property
     def sample_publishing_data(self):
@@ -142,12 +147,13 @@
         Store the `FakePackager` object used in the test uploads as `packager`
         so the tests can reuse it if necessary.
         """
-        self.layer.alterConnection(dbuser='launchpad')
+        self.layer.alterConnection(dbuser=LAUNCHPAD_DBUSER_NAME)
 
-        fake_chroot = LibraryFileAlias.get(1)
-        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
-        warty = ubuntu.getSeries('warty')
-        warty['i386'].addOrUpdateChroot(fake_chroot)
+        fake_chroot = LibraryFileAlias.get(CHROOT_LIBRARYFILEALIAS)
+        ubuntu = getUtility(IDistributionSet).getByName(
+            UBUNTU_DISTRIBUTION_NAME)
+        warty = ubuntu.getSeries(WARTY_DISTROSERIES_NAME)
+        warty[I386_ARCHITECTURE_NAME].addOrUpdateChroot(fake_chroot)
 
         self.layer.txn.commit()
 
@@ -176,13 +182,13 @@
             'zeca', '1.0', '[e-mail]')
         packager.buildUpstream()
         packager.buildSource()
-        packager.uploadSourceVersion('1.0-1', suite="warty-updates")
+        packager.uploadSourceVersion('1.0-1', suite=WARTY_UPDATES_SUITE_NAME)
 
         # Upload a new version of the source, so a PackageDiff can
         # be created.
         packager.buildVersion('1.0-2', changelog_text="cookies")
         packager.buildSource(include_orig=False)
-        packager.uploadSourceVersion('1.0-2', suite="warty-updates")
+        packager.uploadSourceVersion('1.0-2', suite=WARTY_UPDATES_SUITE_NAME)
 
         # Check if there is exactly one pending PackageDiff record and
         # It's the one we have just created.
@@ -193,4 +199,3 @@
     def getPendingDiffs(self):
         """Pending `PackageDiff` available."""
         return getUtility(IPackageDiffSet).getPendingDiffs()
-

=== modified file 'lib/lp/soyuz/tests/soyuzbuilddhelpers.py'
--- lib/lp/soyuz/tests/soyuzbuilddhelpers.py	2010-04-14 13:54:06 +0000
+++ lib/lp/soyuz/tests/soyuzbuilddhelpers.py	2010-08-04 00:47:45 +0000
@@ -26,6 +26,7 @@
     updateBuilderStatus)
 from lp.soyuz.model.binarypackagebuildbehavior import (
     BinaryPackageBuildBehavior)
+from lp.testing.sampledata import I386_ARCHITECTURE_NAME
 
 
 class MockBuilder:
@@ -85,7 +86,7 @@
 
     The architecture tag can be customised during initialisation."""
 
-    def __init__(self, arch_tag='i386'):
+    def __init__(self, arch_tag=I386_ARCHITECTURE_NAME):
         self.arch_tag = arch_tag
 
     def status(self):
@@ -159,7 +160,7 @@
     def getFile(self, sum):
         if sum == "buildlog":
             s = StringIO("This is a build log")
-            s.headers = {'content-length':19}
+            s.headers = {'content-length': 19}
             return s
 
 
@@ -185,7 +186,7 @@
         if hash in self.valid_file_hashes:
             content = "This is a %s" % hash
             s = StringIO(content)
-            s.headers = {'content-length':len(content)}
+            s.headers = {'content-length': len(content)}
             return s
 
 

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-07-21 07:45:50 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-08-04 00:47:45 +0000
@@ -3,10 +3,8 @@
 
 """Test Archive features."""
 
-from datetime import date, datetime, timedelta
-import unittest
+from datetime import date, timedelta
 
-import pytz
 import transaction
 
 from zope.component import getUtility
@@ -29,7 +27,8 @@
 from lp.services.worlddata.interfaces.country import ICountrySet
 from lp.soyuz.interfaces.archivearch import IArchiveArchSet
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
-from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
+from lp.soyuz.interfaces.binarypackagerelease import (
+    BinaryPackageFileType, BinaryPackageFormat)
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
@@ -42,185 +41,167 @@
 
 class TestGetPublicationsInArchive(TestCaseWithFactory):
 
-    layer = LaunchpadZopelessLayer
-
-    def setUp(self):
-        """Use `SoyuzTestPublisher` to publish some sources in archives."""
-        super(TestGetPublicationsInArchive, self).setUp()
-
-        self.distribution = getUtility(IDistributionSet)['ubuntutest']
-
-        # Create two PPAs for gedit.
-        self.archives = {}
-        self.archives['ubuntu-main'] = self.distribution.main_archive
-        self.archives['gedit-nightly'] = self.factory.makeArchive(
-            name="gedit-nightly", distribution=self.distribution)
-        self.archives['gedit-beta'] = self.factory.makeArchive(
-            name="gedit-beta", distribution=self.distribution)
-
-        self.publisher = SoyuzTestPublisher()
-        self.publisher.prepareBreezyAutotest()
-
-        # Publish gedit in all three archives, but with different
-        # upload dates.
-        self.gedit_nightly_src_hist = self.publisher.getPubSource(
-            sourcename="gedit", archive=self.archives['gedit-nightly'],
-            date_uploaded=datetime(2010, 12, 1, tzinfo=pytz.UTC),
-            status=PackagePublishingStatus.PUBLISHED)
-        self.gedit_beta_src_hist = self.publisher.getPubSource(
-            sourcename="gedit", archive=self.archives['gedit-beta'],
-            date_uploaded=datetime(2010, 11, 30, tzinfo=pytz.UTC),
-            status=PackagePublishingStatus.PUBLISHED)
-        self.gedit_main_src_hist = self.publisher.getPubSource(
-            sourcename="gedit", archive=self.archives['ubuntu-main'],
-            date_uploaded=datetime(2010, 12, 30, tzinfo=pytz.UTC),
-            status=PackagePublishingStatus.PUBLISHED)
-
-        # Save the archive utility for easy access, as well as the gedit
-        # source package name.
-        self.archive_set = getUtility(IArchiveSet)
-        spr = self.gedit_main_src_hist.sourcepackagerelease
-        self.gedit_name = spr.sourcepackagename
-
-    def testReturnsAllPublishedPublications(self):
+    layer = DatabaseFunctionalLayer
+
+    def makeArchivesForOneDistribution(self, count=3):
+        distribution = self.factory.makeDistribution()
+        archives = []
+        for i in range(count):
+            archives.append(
+                self.factory.makeArchive(distribution=distribution))
+        return archives
+
+    def makeArchivesWithPublications(self, count=3):
+        archives = self.makeArchivesForOneDistribution(count=count)
+        sourcepackagename = self.factory.makeSourcePackageName()
+        for archive in archives:
+            self.factory.makeSourcePackagePublishingHistory(
+                sourcepackagename=sourcepackagename, archive=archive,
+                status=PackagePublishingStatus.PUBLISHED,
+                )
+        return archives, sourcepackagename
+
+    def getPublications(self, sourcepackagename, archives, distribution):
+        return getUtility(IArchiveSet).getPublicationsInArchives(
+            sourcepackagename, archives, distribution=distribution)
+
+    def test_getPublications_returns_all_published_publications(self):
         # Returns all currently published publications for archives
-        results = self.archive_set.getPublicationsInArchives(
-            self.gedit_name, self.archives.values(),
-            distribution=self.distribution)
+        archives, sourcepackagename = self.makeArchivesWithPublications()
+        results = self.getPublications(
+            sourcepackagename, archives, archives[0].distribution)
         num_results = results.count()
-        self.assertEquals(3, num_results, "Expected 3 publications but "
-                                          "got %s" % num_results)
+        self.assertEquals(3, num_results)
 
-    def testEmptyListOfArchives(self):
+    def test_getPublications_empty_list_of_archives(self):
         # Passing an empty list of archives will result in an empty
         # resultset.
-        results = self.archive_set.getPublicationsInArchives(
-            self.gedit_name, [], distribution=self.distribution)
-        self.assertEquals(0, results.count())
-
-    def testReturnsOnlyPublicationsForGivenArchives(self):
+        archives, sourcepackagename = self.makeArchivesWithPublications()
+        results = self.getPublications(
+            sourcepackagename, [], archives[0].distribution)
+        self.assertEquals([], list(results))
+
+    def assertPublicationsFromArchives(self, publications, archives):
+        self.assertEquals(len(archives), publications.count())
+        for publication, archive in zip(publications, archives):
+            self.assertEquals(archive, publication.archive)
+
+    def test_getPublications_returns_only_for_given_archives(self):
         # Returns only publications for the specified archives
-        results = self.archive_set.getPublicationsInArchives(
-            self.gedit_name, [self.archives['gedit-beta']],
-            distribution=self.distribution)
-        num_results = results.count()
-        self.assertEquals(1, num_results, "Expected 1 publication but "
-                                          "got %s" % num_results)
-        self.assertEquals(self.archives['gedit-beta'],
-                          results[0].archive,
-                          "Expected publication from %s but was instead "
-                          "from %s." % (
-                              self.archives['gedit-beta'].displayname,
-                              results[0].archive.displayname))
+        archives, sourcepackagename = self.makeArchivesWithPublications()
+        results = self.getPublications(
+            sourcepackagename, [archives[0]], archives[0].distribution)
+        self.assertPublicationsFromArchives(results, [archives[0]])
 
-    def testReturnsOnlyPublishedPublications(self):
+    def test_getPublications_returns_only_published_publications(self):
         # Publications that are not published will not be returned.
-        secure_src_hist = self.gedit_beta_src_hist
-        secure_src_hist.status = PackagePublishingStatus.PENDING
-
-        results = self.archive_set.getPublicationsInArchives(
-            self.gedit_name, [self.archives['gedit-beta']],
-            distribution=self.distribution)
-        num_results = results.count()
-        self.assertEquals(0, num_results, "Expected 0 publication but "
-                                          "got %s" % num_results)
-
-    def testPubsForSpecificDistro(self):
+        archive = self.factory.makeArchive()
+        sourcepackagename = self.factory.makeSourcePackageName()
+        self.factory.makeSourcePackagePublishingHistory(
+            archive=archive, sourcepackagename=sourcepackagename,
+            status=PackagePublishingStatus.PENDING)
+        results = self.getPublications(
+            sourcepackagename, [archive], archive.distribution)
+        self.assertEquals([], list(results))
+
+    def publishSourceInNewArchive(self, sourcepackagename):
+        distribution = self.factory.makeDistribution()
+        distroseries = self.factory.makeDistroSeries(
+            distribution=distribution)
+        archive = self.factory.makeArchive(distribution=distribution)
+        self.factory.makeSourcePackagePublishingHistory(
+            archive=archive, sourcepackagename=sourcepackagename,
+            distroseries=distroseries,
+            status=PackagePublishingStatus.PUBLISHED)
+        return archive
+
+    def test_getPublications_for_specific_distro(self):
         # Results can be filtered for specific distributions.
-
-        # Add a publication in the ubuntu distribution
-        ubuntu = getUtility(IDistributionSet)['ubuntu']
-        warty = ubuntu['warty']
-        gedit_main_src_hist = self.publisher.getPubSource(
-            sourcename="gedit",
-            archive=self.archives['ubuntu-main'],
-            distroseries=warty,
-            date_uploaded=datetime(2010, 12, 30, tzinfo=pytz.UTC),
-            status=PackagePublishingStatus.PUBLISHED)
-
-        # Only the 3 results for ubuntutest are returned when requested:
-        results = self.archive_set.getPublicationsInArchives(
-            self.gedit_name, self.archives.values(),
-            distribution=self.distribution)
-        num_results = results.count()
-        self.assertEquals(3, num_results, "Expected 3 publications but "
-                                          "got %s" % num_results)
-
-        # Similarly, requesting the ubuntu publications only returns the
-        # one we created:
-        results = self.archive_set.getPublicationsInArchives(
-            self.gedit_name, self.archives.values(),
-            distribution=ubuntu)
-        num_results = results.count()
-        self.assertEquals(1, num_results, "Expected 1 publication but "
-                                          "got %s" % num_results)
+        sourcepackagename = self.factory.makeSourcePackageName()
+        archive = self.publishSourceInNewArchive(sourcepackagename)
+        other_archive = self.publishSourceInNewArchive(sourcepackagename)
+        # We don't get the results for other_distribution
+        results = self.getPublications(
+            sourcepackagename, [archive, other_archive],
+            distribution=archive.distribution)
+        self.assertPublicationsFromArchives(results, [archive])
 
 
 class TestArchiveRepositorySize(TestCaseWithFactory):
 
     layer = LaunchpadZopelessLayer
 
-    def setUp(self):
-        super(TestArchiveRepositorySize, self).setUp()
-        self.publisher = SoyuzTestPublisher()
-        self.publisher.prepareBreezyAutotest()
-        self.ppa = self.factory.makeArchive(
-            name="testing", distribution=self.publisher.ubuntutest)
+    def publishDDEBInArchive(self, archive):
+        """Publish an arbitrary DDEB with content in to the archive.
+
+        Publishes a DDEB that will take up some space in to `archive`.
+
+        :param archive: the IArchive to publish to.
+        """
+        binarypackagerelease = self.factory.makeBinaryPackageRelease(
+            binpackageformat=BinaryPackageFormat.DDEB)
+        self.factory.makeBinaryPackagePublishingHistory(
+            archive=archive, binarypackagerelease=binarypackagerelease,
+            status=PackagePublishingStatus.PUBLISHED)
+        self.factory.makeBinaryPackageFile(
+            binarypackagerelease=binarypackagerelease,
+            filetype=BinaryPackageFileType.DDEB)
+
+    def test_empty_ppa_has_zero_binaries_size(self):
+        # An empty PPA has no binaries so has zero binaries_size.
+        ppa = self.factory.makeArchive(purpose=ArchivePurpose.PPA)
+        self.assertEquals(0, ppa.binaries_size)
 
     def test_binaries_size_does_not_include_ddebs_for_ppas(self):
         # DDEBs are not computed in the PPA binaries size because
         # they are not being published. See bug #399444.
-        self.assertEquals(0, self.ppa.binaries_size)
-        self.publisher.getPubBinaries(
-            filecontent='X', format=BinaryPackageFormat.DDEB,
-            archive=self.ppa)
-        self.assertEquals(0, self.ppa.binaries_size)
+        ppa = self.factory.makeArchive(purpose=ArchivePurpose.PPA)
+        self.publishDDEBInArchive(ppa)
+        self.assertEquals(0, ppa.binaries_size)
+
+    def test_empty_primary_archive_has_zero_binaries_size(self):
+        # PRIMARY archives have zero binaries_size when created.
+        archive = self.factory.makeArchive(purpose=ArchivePurpose.PRIMARY)
+        self.assertEquals(0, archive.binaries_size)
 
     def test_binaries_size_includes_ddebs_for_other_archives(self):
         # DDEBs size are computed for all archive purposes, except PPAs.
-        previous_size = self.publisher.ubuntutest.main_archive.binaries_size
-        self.publisher.getPubBinaries(
-            filecontent='X', format=BinaryPackageFormat.DDEB)
-        self.assertEquals(
-            previous_size + 1,
-            self.publisher.ubuntutest.main_archive.binaries_size)
+        archive = self.factory.makeArchive(purpose=ArchivePurpose.PRIMARY)
+        self.publishDDEBInArchive(archive)
+        self.assertNotEquals(0, archive.binaries_size)
 
     def test_sources_size_on_empty_archive(self):
         # Zero is returned for an archive without sources.
-        self.assertEquals(
-            0, self.ppa.sources_size,
-            'Zero should be returned for an archive without sources.')
+        archive = self.factory.makeArchive()
+        self.assertEquals(0, archive.sources_size)
+
+    def publishSourceFile(self, archive, library_file):
+        """Publish a source package with the given content to the archive.
+
+        :param archive: the IArchive to publish to.
+        :param library_file: a LibraryFileAlias for the content of the
+            source file.
+        """
+        sourcepackagerelease = self.factory.makeSourcePackageRelease()
+        self.factory.makeSourcePackagePublishingHistory(
+            archive=archive, sourcepackagerelease=sourcepackagerelease,
+            status=PackagePublishingStatus.PUBLISHED)
+        self.factory.makeSourcePackageReleaseFile(
+            sourcepackagerelease=sourcepackagerelease,
+            library_file=library_file)
 
     def test_sources_size_does_not_count_duplicated_files(self):
         # If there are multiple copies of the same file name/size
         # only one will be counted.
-        pub_1 = self.publisher.getPubSource(
-            filecontent='22', version='0.5.11~ppa1', archive=self.ppa)
-
-        pub_2 = self.publisher.getPubSource(
-            filecontent='333', version='0.5.11~ppa2', archive=self.ppa)
-
-        self.assertEquals(5, self.ppa.sources_size)
-
-        shared_tarball = self.publisher.addMockFile(
-            filename='foo_0.5.11.tar.gz', filecontent='1')
-
-        # After adding a the shared tarball to the ppa1 version,
-        # the sources_size updates to reflect the change.
-        pub_1.sourcepackagerelease.addFile(shared_tarball)
-        self.assertEquals(
-            6, self.ppa.sources_size,
-            'The sources_size should update after a file is added.')
-
-        # But after adding a copy of the shared tarball to the ppa2 version,
-        # the sources_size is unchanged.
-        shared_tarball_copy = self.publisher.addMockFile(
-            filename='foo_0.5.11.tar.gz', filecontent='1')
-
-        pub_2.sourcepackagerelease.addFile(shared_tarball_copy)
-        self.assertEquals(
-            6, self.ppa.sources_size,
-            'The sources_size should change after adding a duplicate file.')
+        archive = self.factory.makeArchive()
+        library_file = self.factory.makeLibraryFileAlias()
+        self.publishSourceFile(archive, library_file)
+        self.assertEquals(
+            library_file.content.filesize, archive.sources_size)
+
+        self.publishSourceFile(archive, library_file)
+        self.assertEquals(
+            library_file.content.filesize, archive.sources_size)
 
 
 class TestSeriesWithSources(TestCaseWithFactory):
@@ -634,7 +615,6 @@
                                 self.factory.makeComponent(),
                                 PackagePublishingPocket.PROPOSED),
                                 InvalidPocketForPPA)
-
     # XXX: JRV 20100511: IArchive.canUploadSuiteSourcePackage needs tests
 
 

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-07-25 14:54:01 +0000
+++ lib/lp/testing/__init__.py	2010-08-04 00:47:45 +0000
@@ -79,7 +79,7 @@
 
 from zope.component import adapter, getUtility
 import zope.event
-from zope.interface.verify import verifyClass, verifyObject
+from zope.interface.verify import verifyClass
 from zope.security.proxy import (
     isinstance as zope_isinstance, removeSecurityProxy)
 from zope.testing.testrunner.runner import TestResult as ZopeTestResult
@@ -115,6 +115,7 @@
 from lp.testing._tales import test_tales
 from lp.testing._webservice import (
     launchpadlib_credentials_for, launchpadlib_for, oauth_access_token_for)
+from lp.testing.matchers import Provides
 from lp.testing.fixture import ZopeEventHandlerFixture
 
 # zope.exception demands more of frame objects than twisted.python.failure
@@ -286,13 +287,7 @@
 
     def assertProvides(self, obj, interface):
         """Assert 'obj' correctly provides 'interface'."""
-        self.assertTrue(
-            interface.providedBy(obj),
-            "%r does not provide %r." % (obj, interface))
-        self.assertTrue(
-            verifyObject(interface, obj),
-            "%r claims to provide %r but does not do so correctly."
-            % (obj, interface))
+        self.assertThat(obj, Provides(interface))
 
     def assertClassImplements(self, cls, interface):
         """Assert 'cls' may correctly implement 'interface'."""

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-08-03 22:49:42 +0000
+++ lib/lp/testing/factory.py	2010-08-04 00:47:45 +0000
@@ -125,7 +125,7 @@
 from lp.registry.interfaces.projectgroup import IProjectGroupSet
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.sourcepackage import (
-    ISourcePackage, SourcePackageUrgency)
+    ISourcePackage, SourcePackageFileType, SourcePackageUrgency)
 from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageNameSet)
 from lp.registry.interfaces.ssh import ISSHKeySet
@@ -143,18 +143,18 @@
 from lp.soyuz.interfaces.archive import (
     default_name_by_purpose, IArchiveSet, ArchivePurpose)
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
-from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
+from lp.soyuz.interfaces.binarypackagerelease import (
+    BinaryPackageFileType, BinaryPackageFormat)
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.packageset import IPackagesetSet
 from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import (
-    PackagePublishingPriority, PackagePublishingStatus)
+    IPublishingSet, PackagePublishingPriority, PackagePublishingStatus)
 from lp.soyuz.interfaces.section import ISectionSet
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
+from lp.soyuz.model.files import BinaryPackageFile, SourcePackageReleaseFile
 from lp.soyuz.model.processor import ProcessorFamilySet
-from lp.soyuz.model.publishing import (
-    BinaryPackagePublishingHistory, SourcePackagePublishingHistory)
 from lp.testing import (
     ANONYMOUS,
     login,
@@ -2349,6 +2349,19 @@
             dateuploaded=date_uploaded,
             source_package_recipe_build=source_package_recipe_build)
 
+    def makeSourcePackageReleaseFile(self, sourcepackagerelease=None,
+                                     library_file=None, filetype=None):
+        if sourcepackagerelease is None:
+            sourcepackagerelease = self.makeSourcePackageRelease()
+        if library_file is None:
+            library_file = self.makeLibraryFileAlias()
+        if filetype is None:
+            filetype = SourcePackageFileType.DSC
+        return ProxyFactory(
+            SourcePackageReleaseFile(
+                sourcepackagerelease=sourcepackagerelease,
+                libraryfile=library_file, filetype=filetype))
+
     def makeBinaryPackageBuild(self, source_package_release=None,
             distroarchseries=None, archive=None, builder=None):
         """Create a BinaryPackageBuild.
@@ -2410,6 +2423,7 @@
                                            dsc_standards_version='3.6.2',
                                            dsc_format='1.0',
                                            dsc_binaries='foo-bin',
+                                           sourcepackagerelease=None,
                                            ):
         """Make a `SourcePackagePublishingHistory`."""
         if distroseries is None:
@@ -2430,36 +2444,37 @@
         if status is None:
             status = PackagePublishingStatus.PENDING
 
-        spr = self.makeSourcePackageRelease(
-            archive=archive,
-            sourcepackagename=sourcepackagename,
-            distroseries=distroseries,
-            maintainer=maintainer,
-            creator=creator, component=component,
-            section_name=section_name,
-            urgency=urgency,
-            version=version,
-            builddepends=builddepends,
-            builddependsindep=builddependsindep,
-            build_conflicts=build_conflicts,
-            build_conflicts_indep=build_conflicts_indep,
-            architecturehintlist=architecturehintlist,
-            dsc_standards_version=dsc_standards_version,
-            dsc_format=dsc_format,
-            dsc_binaries=dsc_binaries,
-            date_uploaded=date_uploaded)
-
-        return ProxyFactory(SourcePackagePublishingHistory(
-            distroseries=distroseries,
-            sourcepackagerelease=spr,
-            component=spr.component,
-            section=spr.section,
-            status=status,
-            datecreated=date_uploaded,
-            dateremoved=dateremoved,
-            scheduleddeletiondate=scheduleddeletiondate,
-            pocket=pocket,
-            archive=archive))
+        if sourcepackagerelease is None:
+            sourcepackagerelease = self.makeSourcePackageRelease(
+                archive=archive,
+                sourcepackagename=sourcepackagename,
+                distroseries=distroseries,
+                maintainer=maintainer,
+                creator=creator, component=component,
+                section_name=section_name,
+                urgency=urgency,
+                version=version,
+                builddepends=builddepends,
+                builddependsindep=builddependsindep,
+                build_conflicts=build_conflicts,
+                build_conflicts_indep=build_conflicts_indep,
+                architecturehintlist=architecturehintlist,
+                dsc_standards_version=dsc_standards_version,
+                dsc_format=dsc_format,
+                dsc_binaries=dsc_binaries,
+                date_uploaded=date_uploaded)
+
+        spph = getUtility(IPublishingSet).newSourcePublication(
+            archive, sourcepackagerelease, distroseries,
+            sourcepackagerelease.component, sourcepackagerelease.section,
+            pocket)
+
+        naked_spph = removeSecurityProxy(spph)
+        naked_spph.status = status
+        naked_spph.datecreated = date_uploaded
+        naked_spph.dateremoved = dateremoved
+        naked_spph.scheduleddeletiondate = scheduleddeletiondate
+        return spph
 
     def makeBinaryPackagePublishingHistory(self, binarypackagerelease=None,
                                            distroarchseries=None,
@@ -2492,28 +2507,40 @@
         if priority is None:
             priority = PackagePublishingPriority.OPTIONAL
 
-        bpr = self.makeBinaryPackageRelease(
-            component=component,
-            section_name=section_name,
-            priority=priority)
+        if binarypackagerelease is None:
+            binarypackagerelease = self.makeBinaryPackageRelease(
+                component=component,
+                section_name=section_name,
+                priority=priority)
 
-        return BinaryPackagePublishingHistory(
-            distroarchseries=distroarchseries,
-            binarypackagerelease=bpr,
-            component=bpr.component,
-            section=bpr.section,
-            status=status,
-            dateremoved=dateremoved,
-            scheduleddeletiondate=scheduleddeletiondate,
-            pocket=pocket,
-            priority=priority,
-            archive=archive)
+        bpph = getUtility(IPublishingSet).newBinaryPublication(
+            archive, binarypackagerelease, distroarchseries,
+            binarypackagerelease.component, binarypackagerelease.section,
+            priority, pocket)
+        naked_bpph = removeSecurityProxy(bpph)
+        naked_bpph.status = status
+        naked_bpph.dateremoved = dateremoved
+        naked_bpph.scheduleddeletiondate = scheduleddeletiondate
+        naked_bpph.priority = priority
+        return bpph
 
     def makeBinaryPackageName(self, name=None):
         if name is None:
             name = self.getUniqueString("binarypackage")
         return BinaryPackageName(name=name)
 
+    def makeBinaryPackageFile(self, binarypackagerelease=None,
+                              library_file=None, filetype=None):
+        if binarypackagerelease is None:
+            binarypackagerelease = self.makeBinaryPackageRelease()
+        if library_file is None:
+            library_file = self.makeLibraryFileAlias()
+        if filetype is None:
+            filetype = BinaryPackageFileType.DEB
+        return ProxyFactory(BinaryPackageFile(
+            binarypackagerelease=binarypackagerelease,
+            libraryfile=library_file, filetype=filetype))
+
     def makeBinaryPackageRelease(self, binarypackagename=None,
                                  version=None, build=None,
                                  binpackageformat=None, component=None,
@@ -2538,13 +2565,13 @@
             summary = self.getUniqueString("summary")
         if description is None:
             description = self.getUniqueString("description")
-        return BinaryPackageRelease(binarypackagename=binarypackagename,
-                                    version=version, build=build,
-                                    binpackageformat=binpackageformat,
-                                    component=component, section=section,
-                                    priority=priority, summary=summary,
-                                    description=description,
-                                    architecturespecific=architecturespecific)
+        return ProxyFactory(
+            BinaryPackageRelease(
+                binarypackagename=binarypackagename, version=version,
+                build=build, binpackageformat=binpackageformat,
+                component=component, section=section, priority=priority,
+                summary=summary, description=description,
+                architecturespecific=architecturespecific))
 
     def makeSection(self, name=None):
         """Make a `Section`."""

=== added file 'lib/lp/testing/matchers.py'
--- lib/lp/testing/matchers.py	1970-01-01 00:00:00 +0000
+++ lib/lp/testing/matchers.py	2010-08-04 00:47:45 +0000
@@ -0,0 +1,135 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+__all__ = [
+    'DoesNotProvide',
+    'DoesNotCorrectlyProvide',
+    'IsNotProxied',
+    'IsProxied',
+    'Provides',
+    'ProvidesAndIsProxied',
+    ]
+
+from zope.interface.verify import verifyObject
+from zope.interface.exceptions import (
+    BrokenImplementation, BrokenMethodImplementation, DoesNotImplement)
+from zope.security.proxy import builtin_isinstance, Proxy
+
+from testtools.matchers import Matcher, Mismatch
+
+
+class DoesNotProvide(Mismatch):
+    """An object does not provide an interface."""
+
+    def __init__(self, obj, interface):
+        """Create a DoesNotProvide Mismatch.
+
+        :param obj: the object that does not match.
+        :param interface: the Interface that the object was supposed to match.
+        """
+        self.obj = obj
+        self.interface = interface
+
+    def describe(self):
+        return "%r does not provide %r." % (self.obj, self.interface)
+
+
+class DoesNotCorrectlyProvide(DoesNotProvide):
+    """An object does not correctly provide an interface."""
+
+    def __init__(self, obj, interface, extra=None):
+        """Create a DoesNotCorrectlyProvide Mismatch.
+
+        :param obj: the object that does not match.
+        :param interface: the Interface that the object was supposed to match.
+        :param extra: any extra information about the mismatch as a string,
+            or None
+        """
+        super(DoesNotCorrectlyProvide, self).__init__(obj, interface)
+        self.extra = extra
+
+    def describe(self):
+        if self.extra is not None:
+            extra = ": %s" % self.extra
+        else:
+            extra = "."
+        return ("%r claims to provide %r, but does not do so correctly%s"
+                % (self.obj, self.interface, extra))
+
+
+class Provides(Matcher):
+    """Test that an object provides a certain interface."""
+
+    def __init__(self, interface):
+        """Create a Provides Matcher.
+
+        :param interface: the Interface that the object should provide.
+        """
+        self.interface = interface
+
+    def __str__(self):
+        return "provides %r." % self.interface
+
+    def match(self, matchee):
+        if not self.interface.providedBy(matchee):
+            return DoesNotProvide(matchee, self.interface)
+        passed = True
+        extra = None
+        try:
+            if not verifyObject(self.interface, matchee):
+                passed = False
+        except (BrokenImplementation, BrokenMethodImplementation,
+                DoesNotImplement), e:
+            passed = False
+            extra = str(e)
+        if not passed:
+            return DoesNotCorrectlyProvide(
+                matchee, self.interface, extra=extra)
+        return None
+
+
+class IsNotProxied(Mismatch):
+    """An object is not proxied."""
+
+    def __init__(self, obj):
+        """Create an IsNotProxied Mismatch.
+
+        :param obj: the object that is not proxied.
+        """
+        self.obj = obj
+
+    def describe(self):
+        return "%r is not proxied." % self.obj
+
+
+class IsProxied(Matcher):
+    """Check that an object is proxied."""
+
+    def __str__(self):
+        return "Is proxied."
+
+    def match(self, matchee):
+        if not builtin_isinstance(matchee, Proxy):
+            return IsNotProxied(matchee)
+        return None
+
+
+class ProvidesAndIsProxied(Matcher):
+    """Test that an object implements an interface, and is proxied."""
+
+    def __init__(self, interface):
+        """Create a ProvidesAndIsProxied matcher.
+
+        :param interface: the Interface the object must provide.
+        """
+        self.interface = interface
+
+    def __str__(self):
+        return "Provides %r and is proxied." % self.interface
+
+    def match(self, matchee):
+        mismatch = Provides(self.interface).match(matchee)
+        if mismatch is not None:
+            return mismatch
+        return IsProxied().match(matchee)

=== modified file 'lib/lp/testing/sampledata.py'
--- lib/lp/testing/sampledata.py	2010-07-17 15:52:19 +0000
+++ lib/lp/testing/sampledata.py	2010-08-04 00:47:45 +0000
@@ -9,8 +9,46 @@
 
 __metaclass__ = type
 __all__ = [
+    'BUILDD_ADMIN_USERNAME',
+    'CHROOT_LIBRARYFILEALIAS',
+    'HOARY_DISTROSERIES_NAME',
+    'I386_ARCHITECTURE_NAME',
+    'LAUNCHPAD_DBUSER_NAME',
+    'MAIN_COMPONENT_NAME',
     'NO_PRIVILEGE_EMAIL',
+    'UBUNTU_DEVELOPER_ADMIN_NAME',
+    'UBUNTU_DISTRIBUTION_NAME',
+    'UBUNTU_UPLOAD_TEAM_NAME',
+    'UBUNTUTEST_DISTRIBUTION_NAME',
+    'WARTY_DISTROSERIES_NAME',
+    'WARTY_ONLY_SOURCEPACKAGENAME',
+    'WARTY_ONLY_SOURCEPACKAGEVERSION',
+    'WARTY_UPDATES_SUITE_NAME',
     ]
 
+# Please use names that reveal intent, rather than being purely
+# descriptive, i.e. USER16_NAME isn't as good as
+# UBUNTU_DEVELOPER_NAME. Where intent is tricky to convey in the
+# name, please leave a comment as well.
 
+# A user with buildd admin rights and upload rights to Ubuntu.
+BUILDD_ADMIN_USERNAME = 'cprov'
+# The LibraryFileAlias of a chroot for attaching to a DistroArchSeries
+CHROOT_LIBRARYFILEALIAS = 1
+HOARY_DISTROSERIES_NAME = 'hoary'
+I386_ARCHITECTURE_NAME = 'i386'
+LAUNCHPAD_DBUSER_NAME = 'launchpad'
+MAIN_COMPONENT_NAME = 'main'
 NO_PRIVILEGE_EMAIL = '[e-mail]'
+# A user that is an admin of ubuntu-team, which has upload rights
+# to Ubuntu.
+UBUNTU_DEVELOPER_ADMIN_NAME = 'name16'
+UBUNTU_DISTRIBUTION_NAME = 'ubuntu'
+# A team that has upload rights to Ubuntu
+UBUNTU_UPLOAD_TEAM_NAME = 'ubuntu-team'
+WARTY_DISTROSERIES_NAME = 'warty'
+# A source package name and version for a package only published in
+# warty
+WARTY_ONLY_SOURCEPACKAGENAME = 'mozilla-firefox'
+WARTY_ONLY_SOURCEPACKAGEVERSION = '0.9'
+WARTY_UPDATES_SUITE_NAME = WARTY_DISTROSERIES_NAME + '-updates'

=== modified file 'lib/lp/testing/tests/test_factory.py'
--- lib/lp/testing/tests/test_factory.py	2010-07-26 12:58:13 +0000
+++ lib/lp/testing/tests/test_factory.py	2010-08-04 00:47:45 +0000
@@ -5,23 +5,88 @@
 
 __metaclass__ = type
 
+from datetime import datetime
+import pytz
 import unittest
 
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.webapp.interfaces import ILaunchBag
-from canonical.testing.layers import DatabaseFunctionalLayer
+from canonical.testing.layers import (
+    DatabaseFunctionalLayer, LaunchpadZopelessLayer)
 from lp.code.enums import CodeImportReviewStatus
+from lp.registry.interfaces.sourcepackage import SourcePackageFileType
+from lp.services.worlddata.interfaces.language import ILanguage
+from lp.soyuz.interfaces.binarypackagerelease import (
+    BinaryPackageFileType, IBinaryPackageRelease)
+from lp.soyuz.interfaces.files import (
+    IBinaryPackageFile, ISourcePackageReleaseFile)
+from lp.soyuz.interfaces.publishing import (
+    IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,
+    PackagePublishingPriority, PackagePublishingStatus)
 from lp.testing import TestCaseWithFactory
-from lp.services.worlddata.interfaces.language import ILanguage
 from lp.testing.factory import is_security_proxied_or_harmless
+from lp.testing.matchers import IsProxied, Provides, ProvidesAndIsProxied
 
 
 class TestFactory(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer
 
+    # loginAsAnyone
+    def test_loginAsAnyone(self):
+        # Login as anyone logs you in as any user.
+        person = self.factory.loginAsAnyone()
+        current_person = getUtility(ILaunchBag).user
+        self.assertIsNot(None, person)
+        self.assertEqual(person, current_person)
+
+    # makeBinaryPackagePublishingHistory
+    def test_makeBinaryPackagePublishingHistory_returns_IBPPH(self):
+        bpph = self.factory.makeBinaryPackagePublishingHistory()
+        self.assertThat(
+            removeSecurityProxy(bpph),
+            Provides(IBinaryPackagePublishingHistory))
+
+    def test_makeBinaryPackagePublishingHistory_returns_proxied(self):
+        bpph = self.factory.makeBinaryPackagePublishingHistory()
+        self.assertThat(bpph, IsProxied())
+
+    def test_makeBinaryPackagePublishingHistory_uses_status(self):
+        bpph = self.factory.makeBinaryPackagePublishingHistory(
+            status=PackagePublishingStatus.PENDING)
+        self.assertEquals(PackagePublishingStatus.PENDING, bpph.status)
+        bpph = self.factory.makeBinaryPackagePublishingHistory(
+            status=PackagePublishingStatus.PUBLISHED)
+        self.assertEquals(PackagePublishingStatus.PUBLISHED, bpph.status)
+
+    def test_makeBinaryPackagePublishingHistory_uses_dateremoved(self):
+        dateremoved = datetime.now(pytz.UTC)
+        bpph = self.factory.makeBinaryPackagePublishingHistory(
+            dateremoved=dateremoved)
+        self.assertEquals(dateremoved, bpph.dateremoved)
+
+    def test_makeBinaryPackagePublishingHistory_scheduleddeletiondate(self):
+        scheduleddeletiondate = datetime.now(pytz.UTC)
+        bpph = self.factory.makeBinaryPackagePublishingHistory(
+            scheduleddeletiondate=scheduleddeletiondate)
+        self.assertEquals(scheduleddeletiondate, bpph.scheduleddeletiondate)
+
+    def test_makeBinaryPackagePublishingHistory_uses_priority(self):
+        bpph = self.factory.makeBinaryPackagePublishingHistory(
+            priority=PackagePublishingPriority.OPTIONAL)
+        self.assertEquals(PackagePublishingPriority.OPTIONAL, bpph.priority)
+        bpph = self.factory.makeBinaryPackagePublishingHistory(
+            priority=PackagePublishingPriority.EXTRA)
+        self.assertEquals(PackagePublishingPriority.EXTRA, bpph.priority)
+
+    # makeBinaryPackageRelease
+    def test_makeBinaryPackageRelease_returns_IBinaryPackageRelease(self):
+        bpr = self.factory.makeBinaryPackageRelease()
+        self.assertThat(bpr, ProvidesAndIsProxied(IBinaryPackageRelease))
+
+    # makeCodeImport
     def test_makeCodeImportNoStatus(self):
         # If makeCodeImport is not given a review status, it defaults to NEW.
         code_import = self.factory.makeCodeImport()
@@ -35,6 +100,7 @@
         code_import = self.factory.makeCodeImport(review_status=status)
         self.assertEqual(status, code_import.review_status)
 
+    # makeLanguage
     def test_makeLanguage(self):
         # Without parameters, makeLanguage creates a language with code
         # starting with 'lang'.
@@ -61,12 +127,109 @@
         # And name is constructed from code as 'Language %(code)s'.
         self.assertEquals('Test language', language.englishname)
 
-    def test_loginAsAnyone(self):
-        # Login as anyone logs you in as any user.
-        person = self.factory.loginAsAnyone()
-        current_person = getUtility(ILaunchBag).user
-        self.assertIsNot(None, person)
-        self.assertEqual(person, current_person)
+    # makeSourcePackagePublishingHistory
+    def test_makeSourcePackagePublishingHistory_returns_ISPPH(self):
+        spph = self.factory.makeSourcePackagePublishingHistory()
+        self.assertThat(
+            removeSecurityProxy(spph),
+            Provides(ISourcePackagePublishingHistory))
+
+    def test_makeSourcePackagePublishingHistory_returns_proxied(self):
+        spph = self.factory.makeSourcePackagePublishingHistory()
+        self.assertThat(spph, IsProxied())
+
+    def test_makeSourcePackagePublishingHistory_uses_spr(self):
+        spr = self.factory.makeSourcePackageRelease()
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            sourcepackagerelease=spr)
+        self.assertEquals(spr, spph.sourcepackagerelease)
+
+    def test_makeSourcePackagePublishingHistory_uses_status(self):
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            status=PackagePublishingStatus.PENDING)
+        self.assertEquals(PackagePublishingStatus.PENDING, spph.status)
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            status=PackagePublishingStatus.PUBLISHED)
+        self.assertEquals(PackagePublishingStatus.PUBLISHED, spph.status)
+
+    def test_makeSourcePackagePublishingHistory_uses_date_uploaded(self):
+        date_uploaded = datetime.now(pytz.UTC)
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            date_uploaded=date_uploaded)
+        self.assertEquals(date_uploaded, spph.datecreated)
+
+    def test_makeSourcePackagePublishingHistory_uses_dateremoved(self):
+        dateremoved = datetime.now(pytz.UTC)
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            dateremoved=dateremoved)
+        self.assertEquals(dateremoved, spph.dateremoved)
+
+    def test_makeSourcePackagePublishingHistory_scheduleddeletiondate(self):
+        scheduleddeletiondate = datetime.now(pytz.UTC)
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            scheduleddeletiondate=scheduleddeletiondate)
+        self.assertEquals(scheduleddeletiondate, spph.scheduleddeletiondate)
+
+
+class TestFactoryWithLibrarian(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    # makeBinaryPackageFile
+    def test_makeBinaryPackageFile_returns_IBinaryPackageFile(self):
+        bpf = self.factory.makeBinaryPackageFile()
+        self.assertThat(bpf, ProvidesAndIsProxied(IBinaryPackageFile))
+
+    def test_makeBinaryPackageFile_uses_binarypackagerelease(self):
+        binarypackagerelease = self.factory.makeBinaryPackageRelease()
+        bpf = self.factory.makeBinaryPackageFile(
+            binarypackagerelease=binarypackagerelease)
+        self.assertEqual(binarypackagerelease, bpf.binarypackagerelease)
+
+    def test_makeBinaryPackageFile_uses_library_file(self):
+        library_file = self.factory.makeLibraryFileAlias()
+        bpf = self.factory.makeBinaryPackageFile(
+            library_file=library_file)
+        self.assertEqual(library_file, bpf.libraryfile)
+
+    def test_makeBinaryPackageFile_uses_filetype(self):
+        bpf = self.factory.makeBinaryPackageFile(
+            filetype=BinaryPackageFileType.DEB)
+        self.assertEqual(BinaryPackageFileType.DEB, bpf.filetype)
+        bpf = self.factory.makeBinaryPackageFile(
+            filetype=BinaryPackageFileType.DDEB)
+        self.assertEqual(BinaryPackageFileType.DDEB, bpf.filetype)
+
+    # makeSourcePackageReleaseFile
+    def test_makeSourcePackageReleaseFile_returns_ISPRF(self):
+        spr_file = self.factory.makeSourcePackageReleaseFile()
+        self.assertThat(
+            spr_file, ProvidesAndIsProxied(ISourcePackageReleaseFile))
+
+    def test_makeSourcePackageReleaseFile_uses_sourcepackagerelease(self):
+        spr = self.factory.makeSourcePackageRelease()
+        spr_file = self.factory.makeSourcePackageReleaseFile(
+            sourcepackagerelease=spr)
+        self.assertEqual(spr, spr_file.sourcepackagerelease)
+
+    def test_makeSourcePackageReleaseFile_uses_library_file(self):
+        library_file = self.factory.makeLibraryFileAlias()
+        spr_file = self.factory.makeSourcePackageReleaseFile(
+            library_file=library_file)
+        self.assertEqual(library_file, spr_file.libraryfile)
+
+    def test_makeSourcePackageReleaseFile_uses_filetype(self):
+        spr_file = self.factory.makeSourcePackageReleaseFile(
+            filetype=SourcePackageFileType.DIFF)
+        self.assertEqual(SourcePackageFileType.DIFF, spr_file.filetype)
+        spr_file = self.factory.makeSourcePackageReleaseFile(
+            filetype=SourcePackageFileType.DSC)
+        self.assertEqual(SourcePackageFileType.DSC, spr_file.filetype)
+
+
+class IsSecurityProxiedOrHarmlessTests(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
 
     def test_is_security_proxied_or_harmless__none(self):
         # is_security_proxied_or_harmless() considers the None object

=== added file 'lib/lp/testing/tests/test_matchers.py'
--- lib/lp/testing/tests/test_matchers.py	1970-01-01 00:00:00 +0000
+++ lib/lp/testing/tests/test_matchers.py	2010-08-04 00:47:45 +0000
@@ -0,0 +1,171 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+from zope.interface import implements, Interface
+from zope.interface.verify import verifyObject
+from zope.interface.exceptions import BrokenImplementation
+from zope.security.checker import NamesChecker
+from zope.security.proxy import ProxyFactory
+
+from lp.testing import TestCase
+from lp.testing.matchers import (
+    DoesNotCorrectlyProvide, DoesNotProvide, IsNotProxied, IsProxied,
+    Provides, ProvidesAndIsProxied)
+
+
+class ITestInterface(Interface):
+    """A dummy interface for testing."""
+
+    def doFoo():
+        """Dummy method for interface compliance testing."""
+
+
+class Implementor:
+    """Dummy class that implements ITestInterface for testing."""
+
+    implements(ITestInterface)
+
+    def doFoo(self):
+        pass
+
+
+class DoesNotProvideTests(TestCase):
+
+    def test_describe(self):
+        obj = object()
+        mismatch = DoesNotProvide(obj, ITestInterface)
+        self.assertEqual(
+            "%r does not provide %r." % (obj, ITestInterface),
+            mismatch.describe())
+
+
+class DoesNotCorrectlyProvideMismatchTests(TestCase):
+
+    def test_describe(self):
+        obj = object()
+        mismatch = DoesNotCorrectlyProvide(obj, ITestInterface)
+        self.assertEqual(
+            "%r claims to provide %r, but does not do so correctly."
+                % (obj, ITestInterface),
+            mismatch.describe())
+
+    def test_describe_with_extra(self):
+        obj = object()
+        mismatch = DoesNotCorrectlyProvide(
+            obj, ITestInterface, extra="foo")
+        self.assertEqual(
+            "%r claims to provide %r, but does not do so correctly: foo"
+                % (obj, ITestInterface),
+            mismatch.describe())
+
+
+class ProvidesTests(TestCase):
+
+    def test_str(self):
+        matcher = Provides(ITestInterface)
+        self.assertEqual("provides %r." % ITestInterface, str(matcher))
+
+    def test_matches(self):
+        matcher = Provides(ITestInterface)
+        self.assertEqual(None, matcher.match(Implementor()))
+
+    def match_does_not_provide(self):
+        obj = object()
+        matcher = Provides(ITestInterface)
+        return obj, matcher.match(obj)
+
+    def test_mismatches_not_implements(self):
+        obj, mismatch = self.match_does_not_provide()
+        self.assertIsInstance(mismatch, DoesNotProvide)
+
+    def test_does_not_provide_sets_object(self):
+        obj, mismatch = self.match_does_not_provide()
+        self.assertEqual(obj, mismatch.obj)
+
+    def test_does_not_provide_sets_interface(self):
+        obj, mismatch = self.match_does_not_provide()
+        self.assertEqual(ITestInterface, mismatch.interface)
+
+    def match_does_not_verify(self):
+        class BadlyImplementedClass:
+            implements(ITestInterface)
+        obj = BadlyImplementedClass()
+        matcher = Provides(ITestInterface)
+        return obj, matcher.match(obj)
+
+    def test_mismatch_does_not_verify(self):
+        obj, mismatch = self.match_does_not_verify()
+        self.assertIsInstance(mismatch, DoesNotCorrectlyProvide)
+
+    def test_does_not_verify_sets_object(self):
+        obj, mismatch = self.match_does_not_verify()
+        self.assertEqual(obj, mismatch.obj)
+
+    def test_does_not_verify_sets_interface(self):
+        obj, mismatch = self.match_does_not_verify()
+        self.assertEqual(ITestInterface, mismatch.interface)
+
+    def test_does_not_verify_sets_extra(self):
+        obj, mismatch = self.match_does_not_verify()
+        try:
+            verifyObject(ITestInterface, obj)
+            self.assert_("verifyObject did not raise an exception.")
+        except BrokenImplementation, e:
+            extra = str(e)
+        self.assertEqual(extra, mismatch.extra)
+
+
+class IsNotProxiedTests(TestCase):
+
+    def test_describe(self):
+        obj = object()
+        mismatch = IsNotProxied(obj)
+        self.assertEqual("%r is not proxied." % obj, mismatch.describe())
+
+
+class IsProxiedTests(TestCase):
+
+    def test_str(self):
+        matcher = IsProxied()
+        self.assertEqual("Is proxied.", str(matcher))
+
+    def test_match(self):
+        obj = ProxyFactory(object(), checker=NamesChecker())
+        self.assertEqual(None, IsProxied().match(obj))
+
+    def test_mismatch(self):
+        obj = object()
+        self.assertIsInstance(IsProxied().match(obj), IsNotProxied)
+
+    def test_mismatch_sets_object(self):
+        obj = object()
+        mismatch = IsProxied().match(obj)
+        self.assertEqual(obj, mismatch.obj)
+
+
+class ProvidesAndIsProxiedTests(TestCase):
+
+    def test_str(self):
+        matcher = ProvidesAndIsProxied(ITestInterface)
+        self.assertEqual(
+            "Provides %r and is proxied." % ITestInterface,
+            str(matcher))
+
+    def test_match(self):
+        obj = ProxyFactory(
+            Implementor(), checker=NamesChecker(names=("doFoo",)))
+        matcher = ProvidesAndIsProxied(ITestInterface)
+        self.assertThat(obj, matcher)
+        self.assertEqual(None, matcher.match(obj))
+
+    def test_mismatch_unproxied(self):
+        obj = Implementor()
+        matcher = ProvidesAndIsProxied(ITestInterface)
+        self.assertIsInstance(matcher.match(obj), IsNotProxied)
+
+    def test_mismatch_does_not_implement(self):
+        obj = ProxyFactory(object(), checker=NamesChecker())
+        matcher = ProvidesAndIsProxied(ITestInterface)
+        self.assertIsInstance(matcher.match(obj), DoesNotProvide)