← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_permissions.py

  • Committer: Vincent Ladeuil
  • Date: 2008-08-26 08:25:27 UTC
  • mto: (3668.1.1 trunk) (3703.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3669.
  • Revision ID: v.ladeuil+lp@free.fr-20080826082527-109yyxzc0u24oeel
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.

* bzrlib/transform.py:
(TransformPreview.__init__): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/test_whitebox.py:
(MoreTests.test_relpath): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/test_setup.py:
(TestSetup.test_build_and_install): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/test_bundle.py:
(BundleTester.get_checkout): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/blackbox/test_outside_wt.py:
(TestOutsideWT.test_cwd_log,
TestOutsideWT.test_diff_outside_tree): Use osutils.mkdtemp instead
of tempfile.mkdtemp.

* bzrlib/smart/repository.py:
(SmartServerRepositoryTarball._copy_to_tempdir): Use
osutils.mkdtemp instead of tempfile.mkdtemp.
(SmartServerRepositoryTarball._tarfile_response): Line too long.

* bzrlib/remote.py:
(RemoteRepository._copy_repository_tarball): Use osutils.mkdtemp
instead of tempfile.mkdtemp.

* bzrlib/osutils.py:
(_mac_mkdtemp): Add docstring.

* bzrlib/mail_client.py:
(ExternalMailClient.compose): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/diff.py:
(DiffFromTool.__init__): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_permissions.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
 
 
 
3
#
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
6
6
# the Free Software Foundation; either version 2 of the License, or
7
7
# (at your option) any later version.
8
 
 
 
8
#
9
9
# This program is distributed in the hope that it will be useful,
10
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
12
# GNU General Public License for more details.
13
 
 
 
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
33
33
import os
34
34
import sys
35
35
import stat
36
 
from StringIO import StringIO
 
36
from cStringIO import StringIO
 
37
import urllib
37
38
 
38
39
from bzrlib.branch import Branch
39
40
from bzrlib.bzrdir import BzrDir
46
47
 
47
48
def chmod_r(base, file_mode, dir_mode):
48
49
    """Recursively chmod from a base directory"""
49
 
    assert os.path.isdir(base)
50
50
    os.chmod(base, dir_mode)
51
51
    for root, dirs, files in os.walk(base):
52
52
        for d in dirs:
66
66
    :param dir_mode: The mode for all directories
67
67
    :param include_base: If false, only check the subdirectories
68
68
    """
69
 
    assert os.path.isdir(base)
70
69
    t = get_transport(".")
71
70
    if include_base:
72
71
        test.assertTransportMode(t, base, dir_mode)
73
72
    for root, dirs, files in os.walk(base):
74
73
        for d in dirs:
75
 
            p = os.path.join(root, d)
 
74
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [d]])
76
75
            test.assertTransportMode(t, p, dir_mode)
77
76
        for f in files:
78
77
            p = os.path.join(root, f)
 
78
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [f]])
79
79
            test.assertTransportMode(t, p, file_mode)
80
80
 
81
81
 
88
88
        t = self.make_branch_and_tree('.')
89
89
        b = t.branch
90
90
        open('a', 'wb').write('foo\n')
91
 
        t.add('a')
 
91
        # ensure check_mode_r works with capital-letter file-ids like TREE_ROOT
 
92
        t.add('a', 'CAPS-ID')
92
93
        t.commit('foo')
93
94
 
94
95
        chmod_r('.bzr', 0644, 0755)
103
104
        b = t.branch
104
105
        self.assertEqualMode(0755, b.control_files._dir_mode)
105
106
        self.assertEqualMode(0644, b.control_files._file_mode)
 
107
        self.assertEqualMode(0755, b.bzrdir._get_dir_mode())
 
108
        self.assertEqualMode(0644, b.bzrdir._get_file_mode())
106
109
 
107
110
        # Modifying a file shouldn't break the permissions
108
111
        open('a', 'wb').write('foo2\n')
123
126
        b = t.branch
124
127
        self.assertEqualMode(0775, b.control_files._dir_mode)
125
128
        self.assertEqualMode(0664, b.control_files._file_mode)
 
129
        self.assertEqualMode(0775, b.bzrdir._get_dir_mode())
 
130
        self.assertEqualMode(0664, b.bzrdir._get_file_mode())
126
131
 
127
132
        open('a', 'wb').write('foo3\n')
128
133
        t.commit('foo3')
141
146
        b = t.branch
142
147
        self.assertEqualMode(02775, b.control_files._dir_mode)
143
148
        self.assertEqualMode(0664, b.control_files._file_mode)
 
149
        self.assertEqualMode(02775, b.bzrdir._get_dir_mode())
 
150
        self.assertEqualMode(0664, b.bzrdir._get_file_mode())
144
151
 
145
152
        open('a', 'wb').write('foo4\n')
146
153
        t.commit('foo4')
151
158
        t.commit('new d')
152
159
        check_mode_r(self, '.bzr', 0664, 02775)
153
160
 
154
 
    def test_disable_set_mode(self):
155
 
        # TODO: jam 20051215 Ultimately, this test should probably test that
156
 
        #                    extra chmod calls aren't being made
157
 
        try:
158
 
            transport = get_transport(self.get_url())
159
 
            transport.put('my-lock', StringIO(''))
160
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
161
 
            self.assertNotEqual(None, lockable._dir_mode)
162
 
            self.assertNotEqual(None, lockable._file_mode)
163
 
 
164
 
            LockableFiles._set_dir_mode = False
165
 
            transport = get_transport('.')
166
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
167
 
            self.assertEqual(None, lockable._dir_mode)
168
 
            self.assertNotEqual(None, lockable._file_mode)
169
 
 
170
 
            LockableFiles._set_file_mode = False
171
 
            transport = get_transport('.')
172
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
173
 
            self.assertEqual(None, lockable._dir_mode)
174
 
            self.assertEqual(None, lockable._file_mode)
175
 
 
176
 
            LockableFiles._set_dir_mode = True
177
 
            transport = get_transport('.')
178
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
179
 
            self.assertNotEqual(None, lockable._dir_mode)
180
 
            self.assertEqual(None, lockable._file_mode)
181
 
 
182
 
            LockableFiles._set_file_mode = True
183
 
            transport = get_transport('.')
184
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
185
 
            self.assertNotEqual(None, lockable._dir_mode)
186
 
            self.assertNotEqual(None, lockable._file_mode)
187
 
        finally:
188
 
            LockableFiles._set_dir_mode = True
189
 
            LockableFiles._set_file_mode = True
190
 
 
191
161
 
192
162
class TestSftpPermissions(TestCaseWithSFTPServer):
193
163
 
216
186
        b_local = t.branch
217
187
        self.assertEqualMode(0755, b_local.control_files._dir_mode)
218
188
        self.assertEqualMode(0644, b_local.control_files._file_mode)
 
189
        self.assertEqualMode(0755, b_local.bzrdir._get_dir_mode())
 
190
        self.assertEqualMode(0644, b_local.bzrdir._get_file_mode())
219
191
 
220
192
        os.mkdir('sftp')
221
193
        sftp_url = self.get_url('sftp')
229
201
        b_sftp = Branch.open(sftp_url)
230
202
        self.assertEqualMode(0755, b_sftp.control_files._dir_mode)
231
203
        self.assertEqualMode(0644, b_sftp.control_files._file_mode)
 
204
        self.assertEqualMode(0755, b_sftp.bzrdir._get_dir_mode())
 
205
        self.assertEqualMode(0644, b_sftp.bzrdir._get_file_mode())
232
206
 
233
207
        open('local/a', 'wb').write('foo2\n')
234
208
        t_local.commit('foo2')
250
224
        b_sftp = Branch.open(sftp_url)
251
225
        self.assertEqualMode(0775, b_sftp.control_files._dir_mode)
252
226
        self.assertEqualMode(0664, b_sftp.control_files._file_mode)
 
227
        self.assertEqualMode(0775, b_sftp.bzrdir._get_dir_mode())
 
228
        self.assertEqualMode(0664, b_sftp.bzrdir._get_file_mode())
253
229
 
254
230
        open('local/a', 'wb').write('foo3\n')
255
231
        t_local.commit('foo3')
276
252
            self.assertTransportMode(t, 'a', 0666 &~umask)
277
253
 
278
254
            # but Transport overrides umask
279
 
            t.put('b', 'txt', mode=0666)
 
255
            t.put_bytes('b', 'txt', mode=0666)
280
256
            self.assertTransportMode(t, 'b', 0666)
281
257
 
282
 
            t._sftp.mkdir('c', mode=0777)
 
258
            t._get_sftp().mkdir('c', mode=0777)
283
259
            self.assertTransportMode(t, 'c', 0777 &~umask)
284
260
 
285
261
            t.mkdir('d', mode=0777)