← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remerge.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
74
74
                           'remerge hello --merge-type weave',
75
75
                           retcode=1)
76
76
 
77
 
        self.failUnlessExists('hello.OTHER')
78
 
        self.failIfExists('question.OTHER')
 
77
        self.assertPathExists('hello.OTHER')
 
78
        self.assertPathDoesNotExist('question.OTHER')
79
79
 
80
80
        file_id = self.run_bzr('file-id hello')[0]
81
81
        self.run_bzr_error(['hello.THIS is not versioned'],
84
84
        self.run_bzr_error(['conflicts encountered'],
85
85
                           'remerge --merge-type weave', retcode=1)
86
86
 
87
 
        self.failUnlessExists('hello.OTHER')
88
 
        self.failUnless('hello.BASE')
 
87
        self.assertPathExists('hello.OTHER')
 
88
        self.assertTrue('hello.BASE')
89
89
        self.assertFalse('|||||||' in conflict_text)
90
90
        self.assertFalse('hi world' in conflict_text)
91
91