/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_clean_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_clean_tree.py
56
56
        """Files are selected for deletion appropriately"""
57
57
        os.mkdir('branch')
58
58
        tree = ControlDir.create_standalone_workingtree('branch')
59
 
        transport = tree.controldir.root_transport
60
 
        transport.put_bytes('.bzrignore', b'*~\n*.pyc\n.bzrignore\n')
61
 
        transport.put_bytes('file.BASE', b'contents')
62
 
        with tree.lock_write():
 
59
        transport = tree.bzrdir.root_transport
 
60
        transport.put_bytes('.bzrignore', '*~\n*.pyc\n.bzrignore\n')
 
61
        transport.put_bytes('file.BASE', 'contents')
 
62
        tree.lock_write()
 
63
        try:
63
64
            self.assertEqual(len(list(iter_deletables(tree, unknown=True))), 1)
64
 
            transport.put_bytes('file', b'contents')
65
 
            transport.put_bytes('file~', b'contents')
66
 
            transport.put_bytes('file.pyc', b'contents')
67
 
            dels = sorted([r for a, r in iter_deletables(tree, unknown=True)])
 
65
            transport.put_bytes('file', 'contents')
 
66
            transport.put_bytes('file~', 'contents')
 
67
            transport.put_bytes('file.pyc', 'contents')
 
68
            dels = sorted([r for a,r in iter_deletables(tree, unknown=True)])
68
69
            self.assertEqual(['file', 'file.BASE'], dels)
69
70
 
70
 
            dels = [r for a, r in iter_deletables(tree, detritus=True)]
 
71
            dels = [r for a,r in iter_deletables(tree, detritus=True)]
71
72
            self.assertEqual(sorted(['file~', 'file.BASE']), dels)
72
73
 
73
 
            dels = [r for a, r in iter_deletables(tree, ignored=True)]
 
74
            dels = [r for a,r in iter_deletables(tree, ignored=True)]
74
75
            self.assertEqual(sorted(['file~', 'file.pyc', '.bzrignore']),
75
76
                             dels)
76
77
 
77
 
            dels = [r for a, r in iter_deletables(tree, unknown=False)]
 
78
            dels = [r for a,r in iter_deletables(tree, unknown=False)]
78
79
            self.assertEqual([], dels)
 
80
        finally:
 
81
            tree.unlock()
79
82
 
80
83
    def test_delete_items_warnings(self):
81
84
        """Ensure delete_items issues warnings on EACCES. (bug #430785)
110
113
                    # be shown to the user.
111
114
                    function = os.listdir
112
115
                onerror(function=function,
113
 
                        path=path, excinfo=excinfo)
 
116
                    path=path, excinfo=excinfo)
114
117
 
115
118
        self.overrideAttr(os, 'unlink', _dummy_unlink)
116
119
        self.overrideAttr(shutil, 'rmtree', _dummy_rmtree)
121
124
        self.build_tree(['0foo', '1bar', '2baz', 'subdir0/'])
122
125
        clean_tree('.', unknown=True, no_prompt=True)
123
126
        self.assertContainsRe(stderr.getvalue(),
124
 
                              'bzr: warning: unable to remove.*0foo')
 
127
            'bzr: warning: unable to remove.*0foo')
125
128
        self.assertContainsRe(stderr.getvalue(),
126
 
                              'bzr: warning: unable to remove.*subdir0')
 
129
            'bzr: warning: unable to remove.*subdir0')
127
130
 
128
131
        # Ensure that error other than EACCES during os.remove are
129
132
        # not turned into warnings.
130
133
        self.build_tree(['subdir1/'])
131
134
        self.assertRaises(OSError, clean_tree, '.',
132
 
                          unknown=True, no_prompt=True)
 
135
            unknown=True, no_prompt=True)
 
136