← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Martin Pool
  • Date: 2008-04-24 07:22:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080424072253-opmjij7xfy38w27f
Remove every assert statement from bzrlib!

Depending on the context they are:

 * turned into an explicit if/raise of either AssertionError 
   or something more specific -- particularly where they protect
   programming interfaces, complex invariants, or data file integrity
 * removed, if they're redundant with a later check, not protecting
   a meaningful invariant
 * turned into a selftest method on tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
620
620
        public_branch=None, message=None, base_revision_id=None):
621
621
        include_patch = (patch_type in ('bundle', 'diff'))
622
622
        include_bundle = (patch_type == 'bundle')
623
 
        assert patch_type in ('bundle', 'diff', None)
 
623
        self.assertTrue(patch_type in ('bundle', 'diff', None))
624
624
        return merge_directive.MergeDirective2.from_objects(
625
625
            repository, revision_id, time, timezone, target_branch,
626
626
            include_patch, include_bundle, local_target_branch, public_branch,