/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/blackbox/test_remerge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-05-12 20:26:05 UTC
  • mto: (5853.1.2 trunk) (5609.38.1 2.3)
  • mto: This revision was merged to the branch mainline in revision 5861.
  • Revision ID: v.ladeuil+lp@free.fr-20110512202605-whwfrkgddrxv1exm
Backport fix for deprecated test methods (failIf, failUnless, etc)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
85
85
                           'remerge --merge-type weave', retcode=1)
86
86
 
87
87
        self.failUnlessExists('hello.OTHER')
88
 
        self.failUnless('hello.BASE')
 
88
        self.assertTrue('hello.BASE')
89
89
        self.assertFalse('|||||||' in conflict_text)
90
90
        self.assertFalse('hi world' in conflict_text)
91
91