~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/codehosting/tests/test_branchdistro.py

Committer: j.c.sackett
Date: 2010-09-29 13:33:15 UTC
mfrom: (11656 launchpad)
mto: This revision was merged to the branch mainline in revision 11673.
Revision ID: jonathan.sackett@canonical.com-20100929133315-xv9j43cvevcj3xzh

Merged in devel.

files added:
lib/lp/code/templates/product-portlet-codestatistics-content.pt

lib/lp/code/templates/product-portlet-codestatistics.pt

lib/lp/registry/browser/tests/test_rdf.py

lib/lp/translations/templates/translations-portlet-configuration.pt

lib/lp/translations/templates/translations-portlet-not-using-launchpad-extra.pt

files renamed:
lib/canonical/launchpad/rdfspec/ => lib/lp/registry/rdfspec/

lib/canonical/launchpad/templates/rdf-index.pt => lib/lp/registry/templates/rdf-index.pt

lib/lp/translations/templates/product-portlet-not-using-launchpad.pt => lib/lp/translations/templates/translations-portlet-not-using-launchpad.pt

files modified:
database/sampledata/current-dev.sql

lib/canonical/launchpad/browser/launchpad.py

lib/canonical/launchpad/configure.zcml

lib/canonical/launchpad/icing/style.css

lib/canonical/testing/layers.py

lib/canonical/testing/tests/test_layers.py

lib/lp/app/browser/configure.zcml

lib/lp/app/browser/tales.py

lib/lp/code/browser/branch.py

lib/lp/code/browser/branchlisting.py

lib/lp/code/browser/configure.zcml

lib/lp/code/browser/tests/test_branch.py

lib/lp/code/browser/tests/test_product.py

lib/lp/code/stories/branches/xx-branch-deletion.txt

lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt

lib/lp/code/stories/branches/xx-creating-branches.txt

lib/lp/code/stories/branches/xx-person-branches.txt

lib/lp/code/stories/branches/xx-private-branch-listings.txt

lib/lp/code/stories/branches/xx-product-branches.txt

lib/lp/code/stories/codeimport/xx-create-codeimport.txt

lib/lp/code/templates/branch-listing.pt

lib/lp/code/templates/product-branch-summary.pt

lib/lp/code/templates/product-branches.pt

lib/lp/codehosting/branchdistro.py

lib/lp/codehosting/tests/test_branchdistro.py

lib/lp/registry/browser/__init__.py

lib/lp/registry/browser/configure.zcml

lib/lp/registry/browser/distribution.py

lib/lp/registry/browser/product.py

lib/lp/registry/browser/sourcepackage.py

lib/lp/registry/browser/tests/pillar-views.txt

lib/lp/registry/model/product.py

lib/lp/registry/rdfspec/launchpad.owl

lib/lp/registry/tests/test_service_usage.py

lib/lp/services/mime.py

lib/lp/translations/browser/configure.zcml

lib/lp/translations/browser/distribution.py

lib/lp/translations/browser/distroseries.py

lib/lp/translations/browser/product.py

lib/lp/translations/browser/productseries.py

lib/lp/translations/interfaces/potemplate.py

lib/lp/translations/model/potemplate.py

lib/lp/translations/stories/distribution/xx-distribution-translations.txt

lib/lp/translations/stories/productseries/xx-productseries-translations.txt

lib/lp/translations/stories/standalone/xx-product-translations.txt

lib/lp/translations/templates/distribution-translations.pt

lib/lp/translations/templates/distroseries-translations.pt

lib/lp/translations/templates/product-translations.pt

lib/lp/translations/templates/productseries-translations-upload.pt

lib/lp/translations/templates/productseries-translations.pt

lib/lp/translations/tests/test_hastranslationtemplates.py

test_on_merge.py

Show diffs side-by-side

added added

removed removed

lib/lp/codehosting/tests/test_branchdistro.py

274

self.assertEqual(old_ancestry, new_ancestry)

275

self.assertEqual(old_history, new_history)

276

self.assertFalse(new_branch.pending_writes)

277

self.assertIs(None, new_branch.stacked_on)

278

self.assertEqual(new_branch, db_branch.stacked_on)

277

279

# The script doesn't have permission to create branch jobs, but just

278

280

# to be insanely paradoid.

279

281

transaction.commit()

Older »