Merge lp:~stevenk/launchpad/switch-ifp-to-unittests into lp:launchpad

[Steve Kowalik]

Drop the doctest for scripts/ftpmaster-tools/initialise-from-parent.py, and convert it to a unit test.

This branch drops the doctest for initialise-from-parent, and adds unit tests for the same code.

[Graham Binns (gmb)]

Hi Steve,

So, your new tests look okay, though I'd like to get a second opinion on whether they completely replace the existing doctests since I find the doctests quite torturous to read.

However, the new tests are sorely in need of comments. Firstly, each test_ method should have a comment or docstring (I prefer comments for tests, FTR) explaining what's being tested, in the form:

    def test_frobnob_goes_boing(self):
        # The frobnob will go boing if pushed.

Secondly, I can't tell (because there are no comments to tell me) whether test_initialise() is huge for a reason or whether it can be split into individual tests. I'm guessing that it's huge for a reason, because all the asserts seem to be of the nature of

    foo = bar.foo
    self.assertEqual(expected_foo, foo)

Which is fine, but given the length of the method they should have some explanation with them:

    # The bar's foo will have been updated.
    foo = bar.foo
    self.assertEqual(expected_foo, foo)

As I said, I don't have the context for knowing if the test conversion is accurate, since the old test seems to rely a lot on the output from the script. I'd appreciate it if you could find someone else (Jools maybe) who can confirm that (I'm aware that this is overkill but I'm also aware that this is a Soyuz branch).

I'm marking the branch as needs fixing pending the changes above.

review: Needs Fixing (code)

[Michael Nelson (michael.nelson)]

Hi Steven,

It's great to see the doctest being replaced!

In addition to the method comment mentioned by gmb, I'd also be keen to see all the test_failure_* methods be a bit more specific... the easiest way to do this might be to use self.assertRaisesWithContent() which will ensure that the cause of the raised exception is obvious.

There is generally a lot of info in the doctest which is currently removed... it'd be great to include all the pertinent bits (imagine you knew nothing about soyuz and were looking at this test).

I can't see anything missing from the conversion... perhaps one or two things could be removed (see below). Also, regarding the length of test_initialise,

=== added file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2010-08-10 14:55:27 +0000
@@ -0,0 +1,144 @@
<snip>
+
+ def test_initialise(self):

From here...
+ foobuntu = self._create_distroseries(self.hoary)
+ self._set_pending_to_failed(self.hoary)
+ transaction.commit()
+ ids = InitialiseDistroSeries(foobuntu)
+ ids.check()
+ ids.initialise()
to here could be extracted into self._initialise_distroseries() ?

and then from here:
+ hoary_pmount_pubs = self.hoary.getPublishedReleases('pmount')
+ foobuntu_pmount_pubs = foobuntu.getPublishedReleases('pmount')
+ self.assertEqual(len(hoary_pmount_pubs), len(foobuntu_pmount_pubs))
+ hoary_i386_pmount_pubs = self.hoary['i386'].getReleasedPackages(
+ 'pmount')
+ foobuntu_i386_pmount_pubs = foobuntu['i386'].getReleasedPackages(
+ 'pmount')
+ self.assertEqual(
+ len(hoary_i386_pmount_pubs), len(foobuntu_i386_pmount_pubs))
+ pmount_binrel = (
+ foobuntu['i386'].getReleasedPackages(
+ 'pmount')[0].binarypackagerelease)
+ self.assertEqual(pmount_binrel.title, u'pmount-0.1-1')
+ self.assertEqual(pmount_binrel.build.id, 7)
+ self.assertEqual(
+ pmount_binrel.build.title,
+ u'i386 build of pmount 0.1-1 in ubuntu hoary RELEASE')
+ pmount_srcrel = pmount_binrel.build.source_package_release
+ self.assertEqual(pmount_srcrel.title, u'pmount - 0.1-1')
+ foobuntu_pmount = pmount_srcrel.getBuildByArch(
+ foobuntu['i386'], foobuntu.main_archive)
+ hoary_pmount = pmount_srcrel.getBuildByArch(
+ self.hoary['i386'], self.hoary.main_archive)
+ self.assertEqual(foobuntu_pmount.id, hoary_pmount.id)
+ pmount_source = self.hoary.getSourcePackage(
+ 'pmount').currentrelease
+ self.assertEqual(
+ pmount_source.title,
+ '"pmount" 0.1-2 source package in The Hoary Hedgehog Release')
+ pmount_source = foobuntu.getSourcePackage('pmount').currentrelease
+ self.assertEqual(
+ pmount_source.title,
+ '"pmount" 0.1-2 source package in The Foobuntu')

...to here into self.assertDistroSeriesEqual() (hrm.. with a more accurate method name), so you have a nice small tes...

[Michael Nelson (michael.nelson)]

Hi Steve,

As per our IRC conv., unless there's a reason for not creating a custom assertion such as assertDistroSeriesInitializdCorrectly(), please rename _check_distroseries() to follow normal unit-test assertion names.

Also, this method (whether it is renamed or not) should definitely not be creating builds... it should only be checking/asserting things. That's why I really think it should be a separate test (see comment above where it's identified).

And lastly, you didn't comment on the _initiale_distroseries() - ah, it'd only be necessary/useful to avoid duplicate code if you had the separate test as above.

{{{
12:15 < noodles> StevenK: I assumed when you said earlier that it adds nothing to the test run, that you'd isolated the positive tests, but the diff on the MP still only has test_initialize? Also any reason for not calling _check_distroseries assertDistroSeriesInitialized(distro1, distro2) or similar? (it is a custom assertion right?)
12:19 < jelmer> bigjools: While I'm changing the BinaryPackageRelease table, would it be ok if I also added the field for Homepage?
12:19 < bigjools> jelmer: what's that for?
12:19 < jelmer> bigjools: I have to touch the code that fills it in, and it would help for bug 319196 and bug 602385
12:19 < edbot> Bug #319196: On the source+ page, provide external links <https://launchpad.net/bugs/319196> <soyuz [Triaged/Low] No assignee>
12:19 < edbot> Bug #602385: Allow SPs to register an upstream project <https://launchpad.net/bugs/602385> <launchpad-registry [In Progress/High] Edwin
               Grubbs>
12:20 < bigjools> jelmer: that would need to be on SourcePackageRelease woundn't it?
12:20 < bigjools> wouldn't, even
12:22 < StevenK> noodles: It shouldn't ...
12:22 < StevenK> noodles: Both test_initialise() and test_script() call self._check_distroseries(foobuntu)
12:22 < bigjools> jelmer: also, I'm not sure about that first bug any more, I think we should do it through packaging links
12:22 < bigjools> as per the 2nd bug
12:23 < bigjools> it might be worth talking to Curtis
12:23 < noodles> StevenK: yes, but they both use it like an assertion, so why not a custom assertion as above?
12:23 < jelmer> bigjools: It would need to be on both spr and bpr I guess, since its in both their control fields
12:23 < jelmer> bigjools: I'll ask him, thanks
12:24 < StevenK> noodles: I can rename the method if you wish, but the intent is clear
12:24 < bigjools> jelmer: I can't see the actual use for it in LP if it's on BPR though
12:24 < noodles> StevenK: I don't mind... I was just wondering if there was a reason for not using standard unit-test conventions?
12:24 < StevenK> noodles: I was trying to get away with changing as little code as possible
12:25 < StevenK> It worked, too.
}}}

[Robert Collins (lifeless)]

@Michael, re custom assertions - have you seen the matcher stuff that
James Westby has been emailing about on the dev list? I'm biased ;),
but I think its really nice and cleaner than custom assertions.

-Rob

[Michael Nelson (michael.nelson)]

> @Michael, re custom assertions - have you seen the matcher stuff that
> James Westby has been emailing about on the dev list? I'm biased ;),
> but I think its really nice and cleaner than custom assertions.
>
> -Rob

Yeah I did... they do look great :) I'd be happy if StevenK wanted to use them, but didn't want to request even more changes. I'll leave that up to StevenK.

[Michael Nelson (michael.nelson)]

Thanks again Steven. It looks good now... there are just some inconsistencies in the comments which I've highlighted with a diff (to save confusion):

http://pastebin.ubuntu.com/476903/

With those fixed up as you see fit, r=me.

review: Approve

[Graham Binns (gmb)]

I think Michael's review is more than comprehensive enough to cover my original concerns.

review: Abstain

=== removed file 'lib/lp/soyuz/doc/initialise-from-parent.txt'
--- lib/lp/soyuz/doc/initialise-from-parent.txt	2010-08-12 13:49:50 +0000
+++ lib/lp/soyuz/doc/initialise-from-parent.txt	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-Check the behaviour of the initialise_from_parent script. It basically
-calls IDistroSeries.initialiseFromParent method with experimental extra
-checks and tasks.
-
-We need to create an initialisable DistroSeries as a child of Ubuntu
-Hoary (we do it inside the ubuntutest distribution to avoid conflicts
-with other tests)
-
-  >>> from canonical.launchpad.interfaces import IDistributionSet
-  >>> from canonical.launchpad.ftests import login
-
-  >>> login("[e-mail]")
-  >>> distribution_set = getUtility(IDistributionSet)
-  >>> ubuntutest = distribution_set['ubuntutest']
-  >>> ubuntu = distribution_set['ubuntu']
-  >>> hoary = ubuntu['hoary']
-
-  # XXX cprov 2006-05-29 bug=49133:
-  # New distroseries should be provided by IDistribution.
-  # This maybe affected by derivation design and is documented in bug.
-
-  >>> foobuntu = ubuntutest.newSeries('foobuntu', 'FooBuntu',
-  ...                                 'The Foobuntu', 'yeck', 'doom',
-  ...                                 '888', hoary, hoary.owner)
-
-
-The script will check that there are no NEEDSBUILD builds in the parent
-distroseries' release pocket, so we need to tweak the status of the NEEDSBUILD
-builds that exist in Ubuntu Hoary in the sampledata:
-
-  >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
-  >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
-
-  >>> pending_builds = hoary.getBuildRecords(BuildStatus.NEEDSBUILD,
-  ...     pocket=PackagePublishingPocket.RELEASE)
-  >>> for build in pending_builds:
-  ...     build.status = BuildStatus.FAILEDTOBUILD
-
-  >>> import transaction
-  >>> transaction.commit()
-
-
-  >>> import subprocess
-  >>> import os
-  >>> import sys
-  >>> from canonical.config import config
-
-
-Check if it fails for an already released distroseries:
-
-  >>> script = os.path.join(config.root, "scripts", "ftpmaster-tools",
-  ...                       "initialise-from-parent.py")
-  >>> process = subprocess.Popen([sys.executable, script, "-vv",
-  ...                             "breezy-autotest"],
-  ...                            stdout=subprocess.PIPE,
-  ...                            stderr=subprocess.PIPE,)
-  >>> stdout, stderr = process.communicate()
-  >>> process.returncode
-  1
-  >>> print stderr
-  DEBUG   Acquiring lock
-  DEBUG   Initialising connection.
-  DEBUG   Check empty mutable queues in parentseries
-  DEBUG   Check for no pending builds in parentseries
-  DEBUG   Copying distroarchseries from parent and setting nominatedarchindep.
-  ERROR   Can not copy distroarchseries from parent, there are already distroarchseries(s) initialised for this series.
-  <BLANKLINE>
-
-Let's initialise the just created distroseries:
-
-  >>> process = subprocess.Popen([sys.executable, script, "-vv",
-  ...                             "-d", "ubuntutest", "foobuntu"],
-  ...                            stdout=subprocess.PIPE,
-  ...                            stderr=subprocess.PIPE,)
-  >>> stdout, stderr = process.communicate()
-  >>> process.returncode
-  0
-  >>> print stderr
-  DEBUG   Acquiring lock
-  DEBUG   Initialising connection.
-  DEBUG   Check empty mutable queues in parentseries
-  DEBUG   Check for no pending builds in parentseries
-  DEBUG   Copying distroarchseries from parent and setting nominatedarchindep.
-  DEBUG   initialising from parent, copying publishing records.
-  DEBUG   Committing transaction.
-  DEBUG   Releasing lock
-  <BLANKLINE>
-
-
-Checking the published sources and binaries of ubuntutest/foobuntu
-against its parent, ubuntu/hoary:
-
-  >>> hoary_pmount_pubs = hoary.getPublishedReleases('pmount')
-  >>> foobuntu_pmount_pubs = foobuntu.getPublishedReleases('pmount')
-  >>> len(foobuntu_pmount_pubs) == len(hoary_pmount_pubs)
-  True
-
-  >>> hoary_i386_pmount_pubs = hoary['i386'].getReleasedPackages('pmount')
-  >>> foobuntu_i386_pmount_pubs = (
-  ...     foobuntu['i386'].getReleasedPackages('pmount'))
-  >>> len(foobuntu_i386_pmount_pubs) == len(hoary_i386_pmount_pubs)
-  True
-
-Check how the publication records behave in a just-initialise distroseries.
-First we get a binarypackagerelease published in foobuntu:
-
-  >>> pmount_binrel = (
-  ...     foobuntu['i386'].getReleasedPackages(
-  ...     'pmount')[0].binarypackagerelease)
-  >>> pmount_binrel.title
-  u'pmount-0.1-1'
-
-Follow BPR.build and discover it was built in the parent series:
-
-  >>> pmount_binrel.build.id
-  7
-  >>> pmount_binrel.build.title
-  u'i386 build of pmount 0.1-1 in ubuntu hoary RELEASE'
-
-Now we obtain the sourcepackagerelease from the build:
-
-  >>> pmount_srcrel = pmount_binrel.build.source_package_release
-  >>> pmount_srcrel.title
-  u'pmount - 0.1-1'
-
-and check it the ISPR.getBuildByArch() would find out the same build
-record for foobuntu and it's parent series (hoary):
-
-  >>> foobuntu_pmount = pmount_srcrel.getBuildByArch(
-  ...     foobuntu['i386'], foobuntu.main_archive)
-  >>> hoary_pmount = pmount_srcrel.getBuildByArch(
-  ...     hoary['i386'], hoary.main_archive)
-
-  >>> foobuntu_pmount.id == hoary_pmount.id
-  True
-
-It means that queuebuilder doesn't need to create a new build record
-in for pmount_0.1-1 in foobuntu.
-
-In the other hand there is a newer source for pmount published in
-hoary and consequently in foobuntu:
-
-Note: This is a very unlikely situation, since ubuntu/hoary was marked
-as RELEASED before build pmount_0.1-2 in the sampledata. So when we
-try initialise a distroseries in another distribution based on hoary,
-since they have independent archives (pool), pmount_0.1-1 binary
-becomes a NBS (not build from source) since the pmount_0.1-1 source
-was superseded in hoary and won't be inherited by the initialised
-distroseries.
-
-  >>> pmount_source = hoary.getSourcePackage('pmount').currentrelease
-  >>> print pmount_source.title
-  "pmount" 0.1-2 source package in The Hoary Hedgehog Release
-
-  >>> pmount_source = foobuntu.getSourcePackage('pmount').currentrelease
-  >>> print pmount_source.title
-  "pmount" 0.1-2 source package in The Foobuntu
-
-
-Since pmount_0.1-2 source is published we can safely look up for the
-respective build record:
-
-  >>> pmount_source.sourcepackagerelease.getBuildByArch(
-  ...    foobuntu['i386'], ubuntu.main_archive) is None
-  True
-
-It's not present, Let's create it to check if getBuildByArch responds
-appropriately (we won't care about the source architecturehintlist in
-this test, see more details in buildd-queuebuilder)
-
-  >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
-  >>> created_build = pmount_source.sourcepackagerelease.createBuild(
-  ...     foobuntu['i386'], PackagePublishingPocket.RELEASE,
-  ...     ubuntu.main_archive)
-
-  >>> retrieved_build = pmount_source.sourcepackagerelease.getBuildByArch(
-  ...    foobuntu['i386'], ubuntu.main_archive)
-
-  >>> retrieved_build.id == created_build.id
-  True
-
-  >>> pmount_source.sourcepackagerelease.getBuildByArch(
-  ...    foobuntu['hppa'], ubuntu.main_archive) is None
-  True
-
-initialiseFromParent also copies the permitted source formats from the
-parent series.
-
-  >>> from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
-  >>> foobuntu.isSourcePackageFormatPermitted(SourcePackageFormat.FORMAT_1_0)
-  True

=== added file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py	2010-08-12 13:50:27 +0000
@@ -0,0 +1,183 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test the initialise_distroseries script machinery."""
+
+__metaclass__ = type
+
+import os
+import subprocess
+import sys
+import transaction
+from zope.component import getUtility
+
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
+from lp.soyuz.scripts.initialise_distroseries import (
+    InitialiseDistroSeries, InitialisationError)
+from lp.testing import TestCaseWithFactory
+
+from canonical.config import config
+from canonical.launchpad.interfaces import IDistributionSet
+from canonical.launchpad.ftests import login
+from canonical.testing.layers import LaunchpadZopelessLayer
+
+
+class TestInitialiseDistroSeries(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        super(TestInitialiseDistroSeries, self).setUp()
+        login("[e-mail]")
+        distribution_set = getUtility(IDistributionSet)
+        self.ubuntutest = distribution_set['ubuntutest']
+        self.ubuntu = distribution_set['ubuntu']
+        self.hoary = self.ubuntu['hoary']
+
+    def _create_distroseries(self, parent_series):
+        return self.ubuntutest.newSeries(
+            'foobuntu', 'FooBuntu', 'The Foobuntu', 'yeck', 'doom',
+            '888', parent_series, self.hoary.owner)
+
+    def _set_pending_to_failed(self, distroseries):
+        pending_builds = distroseries.getBuildRecords(
+            BuildStatus.NEEDSBUILD, pocket=PackagePublishingPocket.RELEASE)
+        for build in pending_builds:
+            build.status = BuildStatus.FAILEDTOBUILD
+
+    def test_failure_with_no_parent_series(self):
+        # Initialising a new distro series requires a parent series to be set
+        foobuntu = self._create_distroseries(None)
+        ids = InitialiseDistroSeries(foobuntu)
+        self.assertRaisesWithContent(
+            InitialisationError, "Parent series required.", ids.check)
+
+    def test_failure_for_already_released_distroseries(self):
+        # Initialising a distro series that has already been used will error
+        ids = InitialiseDistroSeries(self.ubuntutest['breezy-autotest'])
+        self.assertRaisesWithContent(
+            InitialisationError,
+            "Can not copy distroarchseries from parent, there are already "
+            "distroarchseries(s) initialised for this series.", ids.check)
+
+    def test_failure_with_pending_builds(self):
+        # If the parent series has pending builds, we can't initialise
+        foobuntu = self._create_distroseries(self.hoary)
+        transaction.commit()
+        ids = InitialiseDistroSeries(foobuntu)
+        self.assertRaisesWithContent(
+            InitialisationError, "Parent series has pending builds.",
+            ids.check)
+
+    def test_failure_with_queue_items(self):
+        # If the parent series has items in its queues, such as NEW and
+        # UNAPPROVED, we can't initialise
+        foobuntu = self._create_distroseries(
+            self.ubuntu['breezy-autotest'])
+        ids = InitialiseDistroSeries(foobuntu)
+        self.assertRaisesWithContent(
+            InitialisationError,"Parent series queues are not empty.",
+            ids.check)
+
+    def assertDistroSeriesInitialisedCorrectly(self, foobuntu):
+        # Check that 'pmount' has been copied correctly
+        hoary_pmount_pubs = self.hoary.getPublishedReleases('pmount')
+        foobuntu_pmount_pubs = foobuntu.getPublishedReleases('pmount')
+        self.assertEqual(len(hoary_pmount_pubs), len(foobuntu_pmount_pubs))
+        hoary_i386_pmount_pubs = self.hoary['i386'].getReleasedPackages(
+            'pmount')
+        foobuntu_i386_pmount_pubs = foobuntu['i386'].getReleasedPackages(
+            'pmount')
+        self.assertEqual(
+            len(hoary_i386_pmount_pubs), len(foobuntu_i386_pmount_pubs))
+        # And the binary package, and linked source package look fine too
+        pmount_binrel = (
+            foobuntu['i386'].getReleasedPackages(
+            'pmount')[0].binarypackagerelease)
+        self.assertEqual(pmount_binrel.title, u'pmount-0.1-1')
+        self.assertEqual(pmount_binrel.build.id, 7)
+        self.assertEqual(
+            pmount_binrel.build.title,
+            u'i386 build of pmount 0.1-1 in ubuntu hoary RELEASE')
+        pmount_srcrel = pmount_binrel.build.source_package_release
+        self.assertEqual(pmount_srcrel.title, u'pmount - 0.1-1')
+        # The build of pmount 0.1-1 has been copied across.
+        foobuntu_pmount = pmount_srcrel.getBuildByArch(
+            foobuntu['i386'], foobuntu.main_archive)
+        hoary_pmount = pmount_srcrel.getBuildByArch(
+            self.hoary['i386'], self.hoary.main_archive)
+        self.assertEqual(foobuntu_pmount.id, hoary_pmount.id)
+        # We also inherient the permitted source formats from our parent
+        self.assertTrue(
+            foobuntu.isSourcePackageFormatPermitted(
+            SourcePackageFormat.FORMAT_1_0))
+
+    def _full_initialise(self):
+        foobuntu = self._create_distroseries(self.hoary)
+        self._set_pending_to_failed(self.hoary)
+        transaction.commit()
+        ids = InitialiseDistroSeries(foobuntu)
+        ids.check()
+        ids.initialise()
+        return foobuntu
+
+    def test_initialise(self):
+        # Test a full initialise with no errors
+        foobuntu = self._full_initialise()
+        self.assertDistroSeriesInitialisedCorrectly(foobuntu)
+
+    def test_check_no_builds(self):
+        # Test that there is no build for pmount 0.1-2 in the
+        # newly-initialised series.
+        foobuntu = self._full_initialise()
+        pmount_source = self.hoary.getSourcePackage(
+            'pmount').currentrelease
+        self.assertEqual(
+            pmount_source.title,
+            '"pmount" 0.1-2 source package in The Hoary Hedgehog Release')
+        pmount_source = foobuntu.getSourcePackage('pmount').currentrelease
+        self.assertEqual(
+            pmount_source.title,
+            '"pmount" 0.1-2 source package in The Foobuntu')
+        self.assertEqual(
+            pmount_source.sourcepackagerelease.getBuildByArch(
+            foobuntu['i386'], foobuntu.main_archive), None)
+        self.assertEqual(
+            pmount_source.sourcepackagerelease.getBuildByArch(
+            foobuntu['hppa'], foobuntu.main_archive), None)
+
+    def test_create_builds(self):
+        # It turns out the sampledata of hoary includes pmount 0.1-1 as well
+        # as pmount 0.1-2 source, and if foobuntu and hoary don't share a
+        # pool, 0.1-1 will be marked as NBS and removed. So let's check that
+        # builds can be created for foobuntu.
+        foobuntu = self._full_initialise()
+        pmount_source = foobuntu.getSourcePackage('pmount').currentrelease
+        created_build = pmount_source.sourcepackagerelease.createBuild(
+            foobuntu['i386'], PackagePublishingPocket.RELEASE,
+            foobuntu.main_archive)
+        retrieved_build = pmount_source.sourcepackagerelease.getBuildByArch(
+            foobuntu['i386'], foobuntu.main_archive)
+        self.assertEqual(retrieved_build.id, created_build.id)
+        self.assertEqual(
+            'i386 build of pmount 0.1-2 in ubuntutest foobuntu RELEASE',
+            created_build.title)
+
+    def test_script(self):
+        # Do an end-to-end test using the command-line tool
+        foobuntu = self._create_distroseries(self.hoary)
+        self._set_pending_to_failed(self.hoary)
+        transaction.commit()
+        ifp = os.path.join(
+            config.root, 'scripts', 'ftpmaster-tools',
+            'initialise-from-parent.py')
+        process = subprocess.Popen(
+            [sys.executable, ifp, "-vv", "-d", "ubuntutest", "foobuntu"],
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = process.communicate()
+        self.assertEqual(process.returncode, 0)
+        self.assertTrue(
+            "DEBUG   Committing transaction." in stderr.split('\n'))
+        self.assertDistroSeriesInitialisedCorrectly(foobuntu)