← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_check_state.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_check_state.py
40
40
        try:
41
41
            dirstate = tree.current_dirstate()
42
42
            dirstate_path = dirstate._filename
43
 
            self.failUnlessExists(dirstate_path)
 
43
            self.assertPathExists(dirstate_path)
44
44
        finally:
45
45
            tree.unlock()
46
46
        # We have to have the tree unlocked at this point, so we can safely
88
88
        # have
89
89
        self.assertEqual(foo_id, tree.path2id('foo'))
90
90
        self.assertEqual(None, tree.path2id('baz'))
91
 
        self.failIfExists('tree/foo')
92
 
        self.failUnlessExists('tree/baz')
 
91
        self.assertPathDoesNotExist('tree/foo')
 
92
        self.assertPathExists('tree/baz')
93
93
 
94
94
    def test_reset_state_handles_corrupted_dirstate(self):
95
95
        tree = self.make_initial_tree()