~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/xmlrpc/tests/test_branch.py

  • Committer: Ian Booth
  • Date: 2010-09-16 04:38:33 UTC
  • mto: This revision was merged to the branch mainline in revision 11615.
  • Revision ID: ian.booth@canonical.com-20100916043833-9vc6eak9qkr0rdij
Inital changes to consolidate makeSeries and makeProductSeries

Show diffs side-by-side

added added

removed removed

Lines of Context:
139
139
        # and to the branch associated with the product series 'series' on
140
140
        # 'product'.
141
141
        product = self.factory.makeProduct()
142
 
        branch = branch=self.factory.makeProductBranch(product=product)
143
 
        series = self.factory.makeSeries(product=product, branch=branch)
 
142
        branch = self.factory.makeProductBranch(product=product)
 
143
        series = self.factory.makeProductSeries(
 
144
            product=product, branch=branch)
144
145
        lp_path = '%s/%s' % (product.name, series.name)
145
146
        self.assertResolves(lp_path, branch.unique_name, lp_path)
146
147
 
151
152
 
152
153
    def test_series_has_no_branch(self):
153
154
        # A series with no branch resolves to the writable alias.
154
 
        series = self.factory.makeSeries(branch=None)
 
155
        series = self.factory.makeProductSeries(branch=None)
155
156
        self.assertOnlyWritableResolves(
156
157
            '%s/%s' % (series.product.name, series.name))
157
158
 
317
318
        # attributes of a private branch and these tests are running as an
318
319
        # anonymous user.
319
320
        branch = self.factory.makeAnyBranch(private=True)
320
 
        series = self.factory.makeSeries(branch=branch)
 
321
        series = self.factory.makeProductSeries(branch=branch)
321
322
        lp_path='%s/%s' % (series.product.name, series.name)
322
323
        self.assertOnlyWritableResolves(lp_path)
323
324