← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
85
85
        restore('hello.sploo')
86
86
        self.assertEqual(len(tree.conflicts()), 0)
87
87
        self.assertFileEqual('hello world2', 'hello')
88
 
        assert not os.path.lexists('hello.sploo')
 
88
        self.assertFalse(os.path.lexists('hello.sploo'))
89
89
        self.assertRaises(NotConflicted, restore, 'hello')
90
90
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
91
91