/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

Merge from bzr.dev

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.assertEqual('failed', verified)
 
531
            self.expectFailure('Patch verification is disabled',
 
532
                               self.assertEqual, 'failed', verified)
532
533
 
533
534
    def test_install_revisions_bundle(self):
534
535
        tree_a, tree_b, branch_c = self.make_trees()