~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_permissions.py

  • Committer: Robert Collins
  • Date: 2006-03-01 03:26:23 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060301032623-9d3c073e102f2239
Move WeaveStore down into bzrlib.store.versioned.weave.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005 by 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 cStringIO import StringIO
37
 
import urllib
 
36
from StringIO import StringIO
38
37
 
39
38
from bzrlib.branch import Branch
40
39
from bzrlib.bzrdir import BzrDir
41
 
from bzrlib.lockable_files import LockableFiles, TransportLock
 
40
from bzrlib.lockable_files import LockableFiles
42
41
from bzrlib.tests import TestCaseWithTransport, TestSkipped
43
42
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
44
43
from bzrlib.transport import get_transport
73
72
        test.assertTransportMode(t, base, dir_mode)
74
73
    for root, dirs, files in os.walk(base):
75
74
        for d in dirs:
76
 
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [d]])
 
75
            p = os.path.join(root, d)
77
76
            test.assertTransportMode(t, p, dir_mode)
78
77
        for f in files:
79
78
            p = os.path.join(root, f)
80
 
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [f]])
81
79
            test.assertTransportMode(t, p, file_mode)
82
80
 
83
81
 
90
88
        t = self.make_branch_and_tree('.')
91
89
        b = t.branch
92
90
        open('a', 'wb').write('foo\n')
93
 
        # ensure check_mode_r works with capital-letter file-ids like TREE_ROOT
94
 
        t.add('a', 'CAPS-ID')
 
91
        t.add('a')
95
92
        t.commit('foo')
96
93
 
97
94
        chmod_r('.bzr', 0644, 0755)
159
156
        #                    extra chmod calls aren't being made
160
157
        try:
161
158
            transport = get_transport(self.get_url())
162
 
            transport.put_bytes('my-lock', '')
163
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
159
            transport.put('my-lock', StringIO(''))
 
160
            lockable = LockableFiles(transport, 'my-lock')
164
161
            self.assertNotEqual(None, lockable._dir_mode)
165
162
            self.assertNotEqual(None, lockable._file_mode)
166
163
 
167
164
            LockableFiles._set_dir_mode = False
168
165
            transport = get_transport('.')
169
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
166
            lockable = LockableFiles(transport, 'my-lock')
170
167
            self.assertEqual(None, lockable._dir_mode)
171
168
            self.assertNotEqual(None, lockable._file_mode)
172
169
 
173
170
            LockableFiles._set_file_mode = False
174
171
            transport = get_transport('.')
175
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
172
            lockable = LockableFiles(transport, 'my-lock')
176
173
            self.assertEqual(None, lockable._dir_mode)
177
174
            self.assertEqual(None, lockable._file_mode)
178
175
 
179
176
            LockableFiles._set_dir_mode = True
180
177
            transport = get_transport('.')
181
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
178
            lockable = LockableFiles(transport, 'my-lock')
182
179
            self.assertNotEqual(None, lockable._dir_mode)
183
180
            self.assertEqual(None, lockable._file_mode)
184
181
 
185
182
            LockableFiles._set_file_mode = True
186
183
            transport = get_transport('.')
187
 
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
184
            lockable = LockableFiles(transport, 'my-lock')
188
185
            self.assertNotEqual(None, lockable._dir_mode)
189
186
            self.assertNotEqual(None, lockable._file_mode)
190
187
        finally:
279
276
            self.assertTransportMode(t, 'a', 0666 &~umask)
280
277
 
281
278
            # but Transport overrides umask
282
 
            t.put_bytes('b', 'txt', mode=0666)
 
279
            t.put('b', 'txt', mode=0666)
283
280
            self.assertTransportMode(t, 'b', 0666)
284
281
 
285
282
            t._sftp.mkdir('c', mode=0777)