← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_clean_tree.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_clean_tree.py
46
46
        BzrDir.create_standalone_workingtree('branch')
47
47
        os.symlink(os.path.realpath('no-die-please'), 'branch/die-please')
48
48
        os.mkdir('no-die-please')
49
 
        self.failUnlessExists('branch/die-please')
 
49
        self.assertPathExists('branch/die-please')
50
50
        os.mkdir('no-die-please/child')
51
51
 
52
52
        clean_tree('branch', unknown=True, no_prompt=True)
53
 
        self.failUnlessExists('no-die-please')
54
 
        self.failUnlessExists('no-die-please/child')
 
53
        self.assertPathExists('no-die-please')
 
54
        self.assertPathExists('no-die-please/child')
55
55
 
56
56
    def test_iter_deletable(self):
57
57
        """Files are selected for deletion appropriately"""
98
98
        def _dummy_rmtree(path, ignore_errors=False, onerror=None):
99
99
            """Call user supplied error handler onerror.
100
100
            """
101
 
            self.assertTrue(isinstance(onerror, types.FunctionType))
102
101
            # Indicate failure in removing 'path' if path is subdir0
103
102
            # We later check to ensure that this is indicated
104
103
            # to the user as a warning. We raise OSError to construct