← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_repair_workingtree.py
33
33
        try:
34
34
            dirstate = tree.current_dirstate()
35
35
            dirstate_path = dirstate._filename
36
 
            self.failUnlessExists(dirstate_path)
 
36
            self.assertPathExists(dirstate_path)
37
37
        finally:
38
38
            tree.unlock()
39
39
        # We have to have the tree unlocked at this point, so we can safely
72
72
        self.run_bzr('repair-workingtree -d tree --force')
73
73
        # This requires the tree has reloaded the working state
74
74
        self.assertIs(None, tree.path2id('alt_dir'))
75
 
        self.failUnlessExists('tree/alt_dir')
 
75
        self.assertPathExists('tree/alt_dir')
76
76
 
77
77
    def test_repair_corrupted_dirstate(self):
78
78
        tree = self.make_initial_tree()