/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: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

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