← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_conflicts.py

Merged Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_conflicts.py
40
40
        self.assertEqual(len(list(tree.list_files())), 6)
41
41
        conflicts = list(tree.iter_conflicts())
42
42
        self.assertEqual(len(conflicts), 2)
43
 
        assert 'hello' in conflicts
44
 
        assert 'hello.sploo' in conflicts
 
43
        self.assert_('hello' in conflicts)
 
44
        self.assert_('hello.sploo' in conflicts)
45
45
        restore('hello')
46
46
        restore('hello.sploo')
47
47
        self.assertEqual(len(list(tree.iter_conflicts())), 0)