~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-12-15 10:01:15 UTC
  • mfrom: (14521 devel)
  • mto: This revision was merged to the branch mainline in revision 14522.
  • Revision ID: jelmer@canonical.com-20111215100115-y6bg928fwdqd16ej
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
224
224
    get_branch_stacked_on_url_tests = loader.loadTestsFromTestCase(
225
225
        TestGetBranchStackedOnURL)
226
226
    scenarios = [scenario for scenario in branch_scenarios()
227
 
                 if scenario[0] not in (
228
 
                     'BranchReferenceFormat', 'GitBranchFormat',
229
 
                     'HgBranchFormat', 'SvnBranchFormat')]
 
227
                 if scenario[0] != 'BranchReferenceFormat']
230
228
    multiply_tests(get_branch_stacked_on_url_tests, scenarios, result)
231
229
 
232
230
    result.addTests(loader.loadTestsFromTestCase(TestIsBranchStackable))