← 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: Aaron Bentley
  • Date: 2007-08-15 20:32:58 UTC
  • mto: This revision was merged to the branch mainline in revision 2747.
  • Revision ID: abentley@panoramicfeedback.com-20070815203258-dryf3x8sotx7q8y0
Reactivate patch verification

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
528
528
            self.assertEqual('inapplicable', verified)
529
529
        else:
530
530
            self.assertEqual('rev1', base)
531
 
            self.expectFailure('Patch verification is disabled',
532
 
                               self.assertEqual, 'failed', verified)
 
531
            self.assertEqual('failed', verified)
533
532
 
534
533
    def test_install_revisions_bundle(self):
535
534
        tree_a, tree_b, branch_c = self.make_trees()