/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

Switched from actual, expected to expected, actual, for John.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
113
113
        self.create_conflicts()
114
114
        self.run_bzr('merge', '../other', retcode=1)
115
115
        wt = WorkingTree.open('.')
116
 
        self.assertEqual(len(wt.conflicts()), 2)
 
116
        self.assertEqual(2, len(wt.conflicts()))
117
117
        self.run_bzr('remerge', retcode=1)
118
118
        wt = WorkingTree.open('.')
119
 
        self.assertEqual(len(wt.conflicts()), 2)
 
119
        self.assertEqual(2, len(wt.conflicts()))
120
120
        self.run_bzr('remerge', 'hello', retcode=1)
121
 
        self.assertEqual(len(wt.conflicts()), 2)
 
121
        self.assertEqual(2, len(wt.conflicts()))