5024.1.1
by John Arbash Meinel
Fix bug #303275, return a kind marker for sockets and fifos. |
1 |
# Copyright (C) 2005-2010 Canonical Ltd
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
16 |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
17 |
"""Tests for the osutils wrapper."""
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
18 |
|
3504.4.12
by John Arbash Meinel
A couple small cleanups, make test_osutils more correct |
19 |
from cStringIO import StringIO |
1732.1.28
by John Arbash Meinel
Add tests for fancy file types. |
20 |
import errno |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
21 |
import os |
4183.6.4
by Martin Pool
Separate out re_compile_checked |
22 |
import re |
1732.1.28
by John Arbash Meinel
Add tests for fancy file types. |
23 |
import socket |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
24 |
import sys |
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
25 |
import time |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
26 |
|
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
27 |
from bzrlib import ( |
28 |
errors, |
|
5326.2.11
by Parth Malwankar
re-install lazy re compile for failing test. |
29 |
lazy_regex, |
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
30 |
osutils, |
5326.2.10
by Parth Malwankar
updated re_compile_checked tests to handle deprecation. |
31 |
symbol_versioning, |
3504.4.1
by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis. |
32 |
tests, |
4695.4.1
by Martin Pool
Give a shorter/cleaner message for missing extensions |
33 |
trace, |
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
34 |
win32utils, |
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
35 |
)
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
36 |
from bzrlib.tests import ( |
5051.4.10
by Parth Malwankar
moved ChownFeature to tests/features.py |
37 |
features, |
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
38 |
file_utils, |
39 |
test__walkdirs_win32, |
|
40 |
)
|
|
4297.1.1
by Vincent Ladeuil
Trivial cleanups. |
41 |
|
42 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
43 |
class _UTF8DirReaderFeature(tests.Feature): |
1739.2.12
by Robert Collins
Add ReadDirFeature as per John's review. |
44 |
|
45 |
def _probe(self): |
|
46 |
try: |
|
47 |
from bzrlib import _readdir_pyx |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
48 |
self.reader = _readdir_pyx.UTF8DirReader |
1739.2.12
by Robert Collins
Add ReadDirFeature as per John's review. |
49 |
return True |
50 |
except ImportError: |
|
51 |
return False |
|
52 |
||
53 |
def feature_name(self): |
|
1739.2.13
by Robert Collins
Fix typo in ReadDirFeature. |
54 |
return 'bzrlib._readdir_pyx' |
1739.2.12
by Robert Collins
Add ReadDirFeature as per John's review. |
55 |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
56 |
UTF8DirReaderFeature = _UTF8DirReaderFeature() |
1739.2.12
by Robert Collins
Add ReadDirFeature as per John's review. |
57 |
|
4913.2.20
by John Arbash Meinel
Change all of the compiled_foo to compiled_foo_feature |
58 |
term_ios_feature = tests.ModuleAvailableFeature('termios') |
4873.2.2
by John Arbash Meinel
Change the TIOCGWINSZ test to use a _ModuleFeature. (fixes bug #492561) |
59 |
|
4241.14.24
by Vincent Ladeuil
Fixed as per John's review. |
60 |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
61 |
def _already_unicode(s): |
62 |
return s |
|
63 |
||
4241.14.24
by Vincent Ladeuil
Fixed as per John's review. |
64 |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
65 |
def _utf8_to_unicode(s): |
66 |
return s.decode('UTF-8') |
|
67 |
||
4241.14.24
by Vincent Ladeuil
Fixed as per John's review. |
68 |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
69 |
def dir_reader_scenarios(): |
70 |
# For each dir reader we define:
|
|
71 |
||
72 |
# - native_to_unicode: a function converting the native_abspath as returned
|
|
73 |
# by DirReader.read_dir to its unicode representation
|
|
74 |
||
75 |
# UnicodeDirReader is the fallback, it should be tested on all platforms.
|
|
4241.14.24
by Vincent Ladeuil
Fixed as per John's review. |
76 |
scenarios = [('unicode', |
77 |
dict(_dir_reader_class=osutils.UnicodeDirReader, |
|
78 |
_native_to_unicode=_already_unicode))] |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
79 |
# Some DirReaders are platform specific and even there they may not be
|
80 |
# available.
|
|
81 |
if UTF8DirReaderFeature.available(): |
|
82 |
from bzrlib import _readdir_pyx |
|
4241.14.24
by Vincent Ladeuil
Fixed as per John's review. |
83 |
scenarios.append(('utf8', |
84 |
dict(_dir_reader_class=_readdir_pyx.UTF8DirReader, |
|
85 |
_native_to_unicode=_utf8_to_unicode))) |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
86 |
|
4913.2.24
by John Arbash Meinel
Track down a few more import typos. |
87 |
if test__walkdirs_win32.win32_readdir_feature.available(): |
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
88 |
try: |
89 |
from bzrlib import _walkdirs_win32 |
|
4241.14.24
by Vincent Ladeuil
Fixed as per John's review. |
90 |
scenarios.append( |
91 |
('win32', |
|
92 |
dict(_dir_reader_class=_walkdirs_win32.Win32ReadDir, |
|
4789.25.3
by John Arbash Meinel
For DirReader tests, the 'fs path' on win32 is a Unicode string, no need to decode/encode. |
93 |
_native_to_unicode=_already_unicode))) |
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
94 |
except ImportError: |
95 |
pass
|
|
96 |
return scenarios |
|
97 |
||
98 |
||
99 |
def load_tests(basic_tests, module, loader): |
|
100 |
suite = loader.suiteClass() |
|
101 |
dir_reader_tests, remaining_tests = tests.split_suite_by_condition( |
|
102 |
basic_tests, tests.condition_isinstance(TestDirReader)) |
|
103 |
tests.multiply_tests(dir_reader_tests, dir_reader_scenarios(), suite) |
|
104 |
suite.addTest(remaining_tests) |
|
105 |
return suite |
|
106 |
||
1739.2.12
by Robert Collins
Add ReadDirFeature as per John's review. |
107 |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
108 |
class TestContainsWhitespace(tests.TestCase): |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
109 |
|
2249.2.1
by John Arbash Meinel
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales. |
110 |
def test_contains_whitespace(self): |
111 |
self.failUnless(osutils.contains_whitespace(u' ')) |
|
112 |
self.failUnless(osutils.contains_whitespace(u'hello there')) |
|
113 |
self.failUnless(osutils.contains_whitespace(u'hellothere\n')) |
|
114 |
self.failUnless(osutils.contains_whitespace(u'hello\nthere')) |
|
115 |
self.failUnless(osutils.contains_whitespace(u'hello\rthere')) |
|
116 |
self.failUnless(osutils.contains_whitespace(u'hello\tthere')) |
|
117 |
||
118 |
# \xa0 is "Non-breaking-space" which on some python locales thinks it
|
|
119 |
# is whitespace, but we do not.
|
|
120 |
self.failIf(osutils.contains_whitespace(u'')) |
|
121 |
self.failIf(osutils.contains_whitespace(u'hellothere')) |
|
122 |
self.failIf(osutils.contains_whitespace(u'hello\xa0there')) |
|
123 |
||
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
124 |
|
125 |
class TestRename(tests.TestCaseInTempDir): |
|
126 |
||
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
127 |
def create_file(self, filename, content): |
128 |
f = open(filename, 'wb') |
|
129 |
try: |
|
130 |
f.write(content) |
|
131 |
finally: |
|
132 |
f.close() |
|
133 |
||
4789.17.2
by John Arbash Meinel
Also handle the case when source *and* target does not exist. |
134 |
def _fancy_rename(self, a, b): |
135 |
osutils.fancy_rename(a, b, rename_func=os.rename, |
|
136 |
unlink_func=os.unlink) |
|
137 |
||
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
138 |
def test_fancy_rename(self): |
139 |
# This should work everywhere
|
|
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
140 |
self.create_file('a', 'something in a\n') |
4789.17.2
by John Arbash Meinel
Also handle the case when source *and* target does not exist. |
141 |
self._fancy_rename('a', 'b') |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
142 |
self.failIfExists('a') |
143 |
self.failUnlessExists('b') |
|
144 |
self.check_file_contents('b', 'something in a\n') |
|
145 |
||
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
146 |
self.create_file('a', 'new something in a\n') |
4789.17.2
by John Arbash Meinel
Also handle the case when source *and* target does not exist. |
147 |
self._fancy_rename('b', 'a') |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
148 |
|
149 |
self.check_file_contents('a', 'something in a\n') |
|
150 |
||
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
151 |
def test_fancy_rename_fails_source_missing(self): |
152 |
# An exception should be raised, and the target should be left in place
|
|
153 |
self.create_file('target', 'data in target\n') |
|
4789.17.2
by John Arbash Meinel
Also handle the case when source *and* target does not exist. |
154 |
self.assertRaises((IOError, OSError), self._fancy_rename, |
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
155 |
'missingsource', 'target') |
156 |
self.failUnlessExists('target') |
|
157 |
self.check_file_contents('target', 'data in target\n') |
|
158 |
||
4789.17.2
by John Arbash Meinel
Also handle the case when source *and* target does not exist. |
159 |
def test_fancy_rename_fails_if_source_and_target_missing(self): |
160 |
self.assertRaises((IOError, OSError), self._fancy_rename, |
|
161 |
'missingsource', 'missingtarget') |
|
162 |
||
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
163 |
def test_rename(self): |
164 |
# Rename should be semi-atomic on all platforms
|
|
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
165 |
self.create_file('a', 'something in a\n') |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
166 |
osutils.rename('a', 'b') |
167 |
self.failIfExists('a') |
|
168 |
self.failUnlessExists('b') |
|
169 |
self.check_file_contents('b', 'something in a\n') |
|
170 |
||
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
171 |
self.create_file('a', 'new something in a\n') |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
172 |
osutils.rename('b', 'a') |
173 |
||
174 |
self.check_file_contents('a', 'something in a\n') |
|
175 |
||
176 |
# TODO: test fancy_rename using a MemoryTransport
|
|
177 |
||
2978.8.2
by Alexander Belchenko
teach fancy_rename to handle change case renames in possible case-insensitive filesystem |
178 |
def test_rename_change_case(self): |
179 |
# on Windows we should be able to change filename case by rename
|
|
2978.8.1
by Alexander Belchenko
Rename on Windows is able to change filename case. (#77740) |
180 |
self.build_tree(['a', 'b/']) |
181 |
osutils.rename('a', 'A') |
|
182 |
osutils.rename('b', 'B') |
|
2978.8.2
by Alexander Belchenko
teach fancy_rename to handle change case renames in possible case-insensitive filesystem |
183 |
# we can't use failUnlessExists on case-insensitive filesystem
|
184 |
# so try to check shape of the tree
|
|
2978.8.1
by Alexander Belchenko
Rename on Windows is able to change filename case. (#77740) |
185 |
shape = sorted(os.listdir('.')) |
186 |
self.assertEquals(['A', 'B'], shape) |
|
187 |
||
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
188 |
|
189 |
class TestRandChars(tests.TestCase): |
|
190 |
||
1553.5.5
by Martin Pool
New utility routine rand_chars |
191 |
def test_01_rand_chars_empty(self): |
192 |
result = osutils.rand_chars(0) |
|
193 |
self.assertEqual(result, '') |
|
194 |
||
195 |
def test_02_rand_chars_100(self): |
|
196 |
result = osutils.rand_chars(100) |
|
197 |
self.assertEqual(len(result), 100) |
|
198 |
self.assertEqual(type(result), str) |
|
199 |
self.assertContainsRe(result, r'^[a-z0-9]{100}$') |
|
200 |
||
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
201 |
|
202 |
class TestIsInside(tests.TestCase): |
|
203 |
||
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
204 |
def test_is_inside(self): |
205 |
is_inside = osutils.is_inside |
|
206 |
self.assertTrue(is_inside('src', 'src/foo.c')) |
|
207 |
self.assertFalse(is_inside('src', 'srccontrol')) |
|
208 |
self.assertTrue(is_inside('src', 'src/a/a/a/foo.c')) |
|
209 |
self.assertTrue(is_inside('foo.c', 'foo.c')) |
|
210 |
self.assertFalse(is_inside('foo.c', '')) |
|
211 |
self.assertTrue(is_inside('', 'foo.c')) |
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
212 |
|
2729.2.4
by Martin Pool
move some osutils-related tests from test_inv to test_osutils |
213 |
def test_is_inside_any(self): |
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
214 |
SRC_FOO_C = osutils.pathjoin('src', 'foo.c') |
2729.2.4
by Martin Pool
move some osutils-related tests from test_inv to test_osutils |
215 |
for dirs, fn in [(['src', 'doc'], SRC_FOO_C), |
216 |
(['src'], SRC_FOO_C), |
|
217 |
(['src'], 'src'), |
|
218 |
]:
|
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
219 |
self.assert_(osutils.is_inside_any(dirs, fn)) |
2729.2.4
by Martin Pool
move some osutils-related tests from test_inv to test_osutils |
220 |
for dirs, fn in [(['src'], 'srccontrol'), |
221 |
(['src'], 'srccontrol/foo')]: |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
222 |
self.assertFalse(osutils.is_inside_any(dirs, fn)) |
2729.2.4
by Martin Pool
move some osutils-related tests from test_inv to test_osutils |
223 |
|
224 |
def test_is_inside_or_parent_of_any(self): |
|
225 |
for dirs, fn in [(['src', 'doc'], 'src/foo.c'), |
|
226 |
(['src'], 'src/foo.c'), |
|
227 |
(['src/bar.c'], 'src'), |
|
228 |
(['src/bar.c', 'bla/foo.c'], 'src'), |
|
229 |
(['src'], 'src'), |
|
230 |
]:
|
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
231 |
self.assert_(osutils.is_inside_or_parent_of_any(dirs, fn)) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
232 |
|
2729.2.4
by Martin Pool
move some osutils-related tests from test_inv to test_osutils |
233 |
for dirs, fn in [(['src'], 'srccontrol'), |
234 |
(['srccontrol/foo.c'], 'src'), |
|
235 |
(['src'], 'srccontrol/foo')]: |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
236 |
self.assertFalse(osutils.is_inside_or_parent_of_any(dirs, fn)) |
2729.2.4
by Martin Pool
move some osutils-related tests from test_inv to test_osutils |
237 |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
238 |
|
239 |
class TestRmTree(tests.TestCaseInTempDir): |
|
240 |
||
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
241 |
def test_rmtree(self): |
242 |
# Check to remove tree with read-only files/dirs
|
|
243 |
os.mkdir('dir') |
|
244 |
f = file('dir/file', 'w') |
|
245 |
f.write('spam') |
|
246 |
f.close() |
|
247 |
# would like to also try making the directory readonly, but at the
|
|
248 |
# moment python shutil.rmtree doesn't handle that properly - it would
|
|
249 |
# need to chmod the directory before removing things inside it - deferred
|
|
250 |
# for now -- mbp 20060505
|
|
251 |
# osutils.make_readonly('dir')
|
|
252 |
osutils.make_readonly('dir/file') |
|
253 |
||
254 |
osutils.rmtree('dir') |
|
255 |
||
256 |
self.failIfExists('dir/file') |
|
257 |
self.failIfExists('dir') |
|
258 |
||
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
259 |
|
4490.1.2
by Martin Pool
test and news for forcing readonly deletion |
260 |
class TestDeleteAny(tests.TestCaseInTempDir): |
261 |
||
262 |
def test_delete_any_readonly(self): |
|
263 |
# from <https://bugs.launchpad.net/bzr/+bug/218206>
|
|
264 |
self.build_tree(['d/', 'f']) |
|
265 |
osutils.make_readonly('d') |
|
266 |
osutils.make_readonly('f') |
|
267 |
||
268 |
osutils.delete_any('f') |
|
269 |
osutils.delete_any('d') |
|
270 |
||
271 |
||
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
272 |
class TestKind(tests.TestCaseInTempDir): |
273 |
||
1732.1.10
by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup |
274 |
def test_file_kind(self): |
275 |
self.build_tree(['file', 'dir/']) |
|
276 |
self.assertEquals('file', osutils.file_kind('file')) |
|
277 |
self.assertEquals('directory', osutils.file_kind('dir/')) |
|
278 |
if osutils.has_symlinks(): |
|
279 |
os.symlink('symlink', 'symlink') |
|
280 |
self.assertEquals('symlink', osutils.file_kind('symlink')) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
281 |
|
1732.1.28
by John Arbash Meinel
Add tests for fancy file types. |
282 |
# TODO: jam 20060529 Test a block device
|
283 |
try: |
|
284 |
os.lstat('/dev/null') |
|
285 |
except OSError, e: |
|
286 |
if e.errno not in (errno.ENOENT,): |
|
287 |
raise
|
|
288 |
else: |
|
289 |
self.assertEquals('chardev', osutils.file_kind('/dev/null')) |
|
290 |
||
291 |
mkfifo = getattr(os, 'mkfifo', None) |
|
292 |
if mkfifo: |
|
293 |
mkfifo('fifo') |
|
294 |
try: |
|
295 |
self.assertEquals('fifo', osutils.file_kind('fifo')) |
|
296 |
finally: |
|
297 |
os.remove('fifo') |
|
298 |
||
299 |
AF_UNIX = getattr(socket, 'AF_UNIX', None) |
|
300 |
if AF_UNIX: |
|
301 |
s = socket.socket(AF_UNIX) |
|
302 |
s.bind('socket') |
|
303 |
try: |
|
304 |
self.assertEquals('socket', osutils.file_kind('socket')) |
|
305 |
finally: |
|
306 |
os.remove('socket') |
|
1732.1.10
by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup |
307 |
|
1551.10.27
by Aaron Bentley
Add a kind marker for subtrees |
308 |
def test_kind_marker(self): |
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
309 |
self.assertEqual("", osutils.kind_marker("file")) |
310 |
self.assertEqual("/", osutils.kind_marker('directory')) |
|
311 |
self.assertEqual("/", osutils.kind_marker(osutils._directory_kind)) |
|
312 |
self.assertEqual("@", osutils.kind_marker("symlink")) |
|
313 |
self.assertEqual("+", osutils.kind_marker("tree-reference")) |
|
5024.1.2
by John Arbash Meinel
Switch so that all unknown files get an empty marker, rather than failing. |
314 |
self.assertEqual("", osutils.kind_marker("fifo")) |
315 |
self.assertEqual("", osutils.kind_marker("socket")) |
|
316 |
self.assertEqual("", osutils.kind_marker("unknown")) |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
317 |
|
318 |
||
319 |
class TestUmask(tests.TestCaseInTempDir): |
|
1551.10.27
by Aaron Bentley
Add a kind marker for subtrees |
320 |
|
1755.3.7
by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size |
321 |
def test_get_umask(self): |
322 |
if sys.platform == 'win32': |
|
323 |
# umask always returns '0', no way to set it
|
|
324 |
self.assertEqual(0, osutils.get_umask()) |
|
325 |
return
|
|
326 |
||
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
327 |
orig_umask = osutils.get_umask() |
328 |
self.addCleanup(os.umask, orig_umask) |
|
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
329 |
os.umask(0222) |
330 |
self.assertEqual(0222, osutils.get_umask()) |
|
331 |
os.umask(0022) |
|
332 |
self.assertEqual(0022, osutils.get_umask()) |
|
333 |
os.umask(0002) |
|
334 |
self.assertEqual(0002, osutils.get_umask()) |
|
335 |
os.umask(0027) |
|
336 |
self.assertEqual(0027, osutils.get_umask()) |
|
1755.3.7
by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size |
337 |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
338 |
|
339 |
class TestDateTime(tests.TestCase): |
|
340 |
||
1957.1.15
by John Arbash Meinel
Review feedback from Robert |
341 |
def assertFormatedDelta(self, expected, seconds): |
342 |
"""Assert osutils.format_delta formats as expected"""
|
|
343 |
actual = osutils.format_delta(seconds) |
|
344 |
self.assertEqual(expected, actual) |
|
345 |
||
1957.1.4
by John Arbash Meinel
create a helper for formatting a time delta |
346 |
def test_format_delta(self): |
1957.1.15
by John Arbash Meinel
Review feedback from Robert |
347 |
self.assertFormatedDelta('0 seconds ago', 0) |
348 |
self.assertFormatedDelta('1 second ago', 1) |
|
349 |
self.assertFormatedDelta('10 seconds ago', 10) |
|
350 |
self.assertFormatedDelta('59 seconds ago', 59) |
|
351 |
self.assertFormatedDelta('89 seconds ago', 89) |
|
352 |
self.assertFormatedDelta('1 minute, 30 seconds ago', 90) |
|
353 |
self.assertFormatedDelta('3 minutes, 0 seconds ago', 180) |
|
354 |
self.assertFormatedDelta('3 minutes, 1 second ago', 181) |
|
355 |
self.assertFormatedDelta('10 minutes, 15 seconds ago', 615) |
|
356 |
self.assertFormatedDelta('30 minutes, 59 seconds ago', 1859) |
|
357 |
self.assertFormatedDelta('31 minutes, 0 seconds ago', 1860) |
|
358 |
self.assertFormatedDelta('60 minutes, 0 seconds ago', 3600) |
|
359 |
self.assertFormatedDelta('89 minutes, 59 seconds ago', 5399) |
|
360 |
self.assertFormatedDelta('1 hour, 30 minutes ago', 5400) |
|
361 |
self.assertFormatedDelta('2 hours, 30 minutes ago', 9017) |
|
362 |
self.assertFormatedDelta('10 hours, 0 minutes ago', 36000) |
|
363 |
self.assertFormatedDelta('24 hours, 0 minutes ago', 86400) |
|
364 |
self.assertFormatedDelta('35 hours, 59 minutes ago', 129599) |
|
365 |
self.assertFormatedDelta('36 hours, 0 minutes ago', 129600) |
|
366 |
self.assertFormatedDelta('36 hours, 0 minutes ago', 129601) |
|
367 |
self.assertFormatedDelta('36 hours, 1 minute ago', 129660) |
|
368 |
self.assertFormatedDelta('36 hours, 1 minute ago', 129661) |
|
369 |
self.assertFormatedDelta('84 hours, 10 minutes ago', 303002) |
|
1957.1.4
by John Arbash Meinel
create a helper for formatting a time delta |
370 |
|
371 |
# We handle when time steps the wrong direction because computers
|
|
372 |
# don't have synchronized clocks.
|
|
1957.1.15
by John Arbash Meinel
Review feedback from Robert |
373 |
self.assertFormatedDelta('84 hours, 10 minutes in the future', -303002) |
374 |
self.assertFormatedDelta('1 second in the future', -1) |
|
375 |
self.assertFormatedDelta('2 seconds in the future', -2) |
|
1957.1.4
by John Arbash Meinel
create a helper for formatting a time delta |
376 |
|
3144.1.1
by Lukáš Lalinský
Fixed error reporting of unsupported timezone format. |
377 |
def test_format_date(self): |
378 |
self.assertRaises(errors.UnsupportedTimezoneFormat, |
|
379 |
osutils.format_date, 0, timezone='foo') |
|
3526.5.4
by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode. |
380 |
self.assertIsInstance(osutils.format_date(0), str) |
381 |
self.assertIsInstance(osutils.format_local_date(0), unicode) |
|
382 |
# Testing for the actual value of the local weekday without
|
|
3526.5.2
by Martin von Gagern
Check output type of format_date |
383 |
# duplicating the code from format_date is difficult.
|
384 |
# Instead blackbox.test_locale should check for localized
|
|
385 |
# dates once they do occur in output strings.
|
|
3144.1.1
by Lukáš Lalinský
Fixed error reporting of unsupported timezone format. |
386 |
|
4379.4.2
by Ian Clatworthy
add NEWS item and tests for new date formatting API |
387 |
def test_format_date_with_offset_in_original_timezone(self): |
388 |
self.assertEqual("Thu 1970-01-01 00:00:00 +0000", |
|
389 |
osutils.format_date_with_offset_in_original_timezone(0)) |
|
390 |
self.assertEqual("Fri 1970-01-02 03:46:40 +0000", |
|
391 |
osutils.format_date_with_offset_in_original_timezone(100000)) |
|
392 |
self.assertEqual("Fri 1970-01-02 05:46:40 +0200", |
|
393 |
osutils.format_date_with_offset_in_original_timezone(100000, 7200)) |
|
394 |
||
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
395 |
def test_local_time_offset(self): |
396 |
"""Test that local_time_offset() returns a sane value."""
|
|
397 |
offset = osutils.local_time_offset() |
|
398 |
self.assertTrue(isinstance(offset, int)) |
|
399 |
# Test that the offset is no more than a eighteen hours in
|
|
400 |
# either direction.
|
|
401 |
# Time zone handling is system specific, so it is difficult to
|
|
402 |
# do more specific tests, but a value outside of this range is
|
|
403 |
# probably wrong.
|
|
404 |
eighteen_hours = 18 * 3600 |
|
405 |
self.assertTrue(-eighteen_hours < offset < eighteen_hours) |
|
406 |
||
407 |
def test_local_time_offset_with_timestamp(self): |
|
408 |
"""Test that local_time_offset() works with a timestamp."""
|
|
409 |
offset = osutils.local_time_offset(1000000000.1234567) |
|
410 |
self.assertTrue(isinstance(offset, int)) |
|
411 |
eighteen_hours = 18 * 3600 |
|
412 |
self.assertTrue(-eighteen_hours < offset < eighteen_hours) |
|
413 |
||
414 |
||
415 |
class TestLinks(tests.TestCaseInTempDir): |
|
416 |
||
2091.3.7
by Aaron Bentley
Rename real_parent to dereferenced_path |
417 |
def test_dereference_path(self): |
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
418 |
self.requireFeature(tests.SymlinkFeature) |
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
419 |
cwd = osutils.realpath('.') |
420 |
os.mkdir('bar') |
|
421 |
bar_path = osutils.pathjoin(cwd, 'bar') |
|
422 |
# Using './' to avoid bug #1213894 (first path component not
|
|
423 |
# dereferenced) in Python 2.4.1 and earlier
|
|
424 |
self.assertEqual(bar_path, osutils.realpath('./bar')) |
|
425 |
os.symlink('bar', 'foo') |
|
426 |
self.assertEqual(bar_path, osutils.realpath('./foo')) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
427 |
|
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
428 |
# Does not dereference terminal symlinks
|
429 |
foo_path = osutils.pathjoin(cwd, 'foo') |
|
2091.3.7
by Aaron Bentley
Rename real_parent to dereferenced_path |
430 |
self.assertEqual(foo_path, osutils.dereference_path('./foo')) |
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
431 |
|
432 |
# Dereferences parent symlinks
|
|
433 |
os.mkdir('bar/baz') |
|
434 |
baz_path = osutils.pathjoin(bar_path, 'baz') |
|
2091.3.7
by Aaron Bentley
Rename real_parent to dereferenced_path |
435 |
self.assertEqual(baz_path, osutils.dereference_path('./foo/baz')) |
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
436 |
|
437 |
# Dereferences parent symlinks that are the first path element
|
|
2091.3.7
by Aaron Bentley
Rename real_parent to dereferenced_path |
438 |
self.assertEqual(baz_path, osutils.dereference_path('foo/baz')) |
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
439 |
|
440 |
# Dereferences parent symlinks in absolute paths
|
|
441 |
foo_baz_path = osutils.pathjoin(foo_path, 'baz') |
|
2091.3.7
by Aaron Bentley
Rename real_parent to dereferenced_path |
442 |
self.assertEqual(baz_path, osutils.dereference_path(foo_baz_path)) |
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
443 |
|
2568.1.1
by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable |
444 |
def test_changing_access(self): |
445 |
f = file('file', 'w') |
|
446 |
f.write('monkey') |
|
447 |
f.close() |
|
448 |
||
449 |
# Make a file readonly
|
|
450 |
osutils.make_readonly('file') |
|
2949.6.2
by Alexander Belchenko
more changes osutils.lstat -> os.lstat |
451 |
mode = os.lstat('file').st_mode |
2568.1.1
by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable |
452 |
self.assertEqual(mode, mode & 0777555) |
453 |
||
454 |
# Make a file writable
|
|
455 |
osutils.make_writable('file') |
|
2949.6.2
by Alexander Belchenko
more changes osutils.lstat -> os.lstat |
456 |
mode = os.lstat('file').st_mode |
2568.1.1
by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable |
457 |
self.assertEqual(mode, mode | 0200) |
458 |
||
459 |
if osutils.has_symlinks(): |
|
460 |
# should not error when handed a symlink
|
|
461 |
os.symlink('nonexistent', 'dangling') |
|
462 |
osutils.make_readonly('dangling') |
|
463 |
osutils.make_writable('dangling') |
|
464 |
||
3287.18.26
by Matt McClure
Addresses concerns raised in |
465 |
def test_host_os_dereferences_symlinks(self): |
466 |
osutils.host_os_dereferences_symlinks() |
|
467 |
||
2324.2.1
by Dmitry Vasiliev
kind_marker() optimization |
468 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
469 |
class TestCanonicalRelPath(tests.TestCaseInTempDir): |
3794.5.36
by Mark Hammond
test for, and fix problem with canonical_relpath when the tail does not exist. |
470 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
471 |
_test_needs_features = [tests.CaseInsCasePresFilenameFeature] |
3794.5.36
by Mark Hammond
test for, and fix problem with canonical_relpath when the tail does not exist. |
472 |
|
473 |
def test_canonical_relpath_simple(self): |
|
474 |
f = file('MixedCaseName', 'w') |
|
475 |
f.close() |
|
4707.1.1
by Vincent Ladeuil
Fix OSX and FreeBSD failures. |
476 |
actual = osutils.canonical_relpath(self.test_base_dir, 'mixedcasename') |
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
477 |
self.failUnlessEqual('work/MixedCaseName', actual) |
3794.5.36
by Mark Hammond
test for, and fix problem with canonical_relpath when the tail does not exist. |
478 |
|
479 |
def test_canonical_relpath_missing_tail(self): |
|
480 |
os.mkdir('MixedCaseParent') |
|
4707.1.1
by Vincent Ladeuil
Fix OSX and FreeBSD failures. |
481 |
actual = osutils.canonical_relpath(self.test_base_dir, |
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
482 |
'mixedcaseparent/nochild') |
483 |
self.failUnlessEqual('work/MixedCaseParent/nochild', actual) |
|
3794.5.36
by Mark Hammond
test for, and fix problem with canonical_relpath when the tail does not exist. |
484 |
|
485 |
||
4634.70.2
by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle |
486 |
class Test_CICPCanonicalRelpath(tests.TestCaseWithTransport): |
487 |
||
488 |
def assertRelpath(self, expected, base, path): |
|
489 |
actual = osutils._cicp_canonical_relpath(base, path) |
|
490 |
self.assertEqual(expected, actual) |
|
491 |
||
492 |
def test_simple(self): |
|
493 |
self.build_tree(['MixedCaseName']) |
|
494 |
base = osutils.realpath(self.get_transport('.').local_abspath('.')) |
|
495 |
self.assertRelpath('MixedCaseName', base, 'mixedcAsename') |
|
496 |
||
497 |
def test_subdir_missing_tail(self): |
|
498 |
self.build_tree(['MixedCaseParent/', 'MixedCaseParent/a_child']) |
|
499 |
base = osutils.realpath(self.get_transport('.').local_abspath('.')) |
|
500 |
self.assertRelpath('MixedCaseParent/a_child', base, |
|
501 |
'MixedCaseParent/a_child') |
|
502 |
self.assertRelpath('MixedCaseParent/a_child', base, |
|
503 |
'MixedCaseParent/A_Child') |
|
504 |
self.assertRelpath('MixedCaseParent/not_child', base, |
|
505 |
'MixedCaseParent/not_child') |
|
506 |
||
4634.70.6
by John Arbash Meinel
Mix up the test a bit. On Windows we don't run the '/' test |
507 |
def test_at_root_slash(self): |
4634.70.2
by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle |
508 |
# We can't test this on Windows, because it has a 'MIN_ABS_PATHLENGTH'
|
509 |
# check...
|
|
4634.70.4
by John Arbash Meinel
Take spiv's suggestion and move the '/' test to another test case. |
510 |
if osutils.MIN_ABS_PATHLENGTH > 1: |
4634.70.6
by John Arbash Meinel
Mix up the test a bit. On Windows we don't run the '/' test |
511 |
raise tests.TestSkipped('relpath requires %d chars' |
512 |
% osutils.MIN_ABS_PATHLENGTH) |
|
4634.70.4
by John Arbash Meinel
Take spiv's suggestion and move the '/' test to another test case. |
513 |
self.assertRelpath('foo', '/', '/foo') |
4634.70.2
by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle |
514 |
|
4634.70.6
by John Arbash Meinel
Mix up the test a bit. On Windows we don't run the '/' test |
515 |
def test_at_root_drive(self): |
516 |
if sys.platform != 'win32': |
|
517 |
raise tests.TestNotApplicable('we can only test drive-letter relative' |
|
518 |
' paths on Windows where we have drive'
|
|
519 |
' letters.') |
|
4634.70.2
by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle |
520 |
# see bug #322807
|
521 |
# The specific issue is that when at the root of a drive, 'abspath'
|
|
522 |
# returns "C:/" or just "/". However, the code assumes that abspath
|
|
523 |
# always returns something like "C:/foo" or "/foo" (no trailing slash).
|
|
524 |
self.assertRelpath('foo', 'C:/', 'C:/foo') |
|
525 |
self.assertRelpath('foo', 'X:/', 'X:/foo') |
|
526 |
self.assertRelpath('foo', 'X:/', 'X://foo') |
|
527 |
||
528 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
529 |
class TestPumpFile(tests.TestCase): |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
530 |
"""Test pumpfile method."""
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
531 |
|
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
532 |
def setUp(self): |
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
533 |
tests.TestCase.setUp(self) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
534 |
# create a test datablock
|
535 |
self.block_size = 512 |
|
536 |
pattern = '0123456789ABCDEF' |
|
537 |
self.test_data = pattern * (3 * self.block_size / len(pattern)) |
|
538 |
self.test_data_len = len(self.test_data) |
|
539 |
||
540 |
def test_bracket_block_size(self): |
|
541 |
"""Read data in blocks with the requested read size bracketing the
|
|
542 |
block size."""
|
|
543 |
# make sure test data is larger than max read size
|
|
544 |
self.assertTrue(self.test_data_len > self.block_size) |
|
545 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
546 |
from_file = file_utils.FakeReadFile(self.test_data) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
547 |
to_file = StringIO() |
548 |
||
549 |
# read (max / 2) bytes and verify read size wasn't affected
|
|
550 |
num_bytes_to_read = self.block_size / 2 |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
551 |
osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
552 |
self.assertEqual(from_file.get_max_read_size(), num_bytes_to_read) |
553 |
self.assertEqual(from_file.get_read_count(), 1) |
|
554 |
||
555 |
# read (max) bytes and verify read size wasn't affected
|
|
556 |
num_bytes_to_read = self.block_size |
|
557 |
from_file.reset_read_count() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
558 |
osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
559 |
self.assertEqual(from_file.get_max_read_size(), num_bytes_to_read) |
560 |
self.assertEqual(from_file.get_read_count(), 1) |
|
561 |
||
562 |
# read (max + 1) bytes and verify read size was limited
|
|
563 |
num_bytes_to_read = self.block_size + 1 |
|
564 |
from_file.reset_read_count() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
565 |
osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
566 |
self.assertEqual(from_file.get_max_read_size(), self.block_size) |
567 |
self.assertEqual(from_file.get_read_count(), 2) |
|
568 |
||
569 |
# finish reading the rest of the data
|
|
570 |
num_bytes_to_read = self.test_data_len - to_file.tell() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
571 |
osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
572 |
|
573 |
# report error if the data wasn't equal (we only report the size due
|
|
574 |
# to the length of the data)
|
|
575 |
response_data = to_file.getvalue() |
|
576 |
if response_data != self.test_data: |
|
577 |
message = "Data not equal. Expected %d bytes, received %d." |
|
578 |
self.fail(message % (len(response_data), self.test_data_len)) |
|
579 |
||
580 |
def test_specified_size(self): |
|
581 |
"""Request a transfer larger than the maximum block size and verify
|
|
582 |
that the maximum read doesn't exceed the block_size."""
|
|
583 |
# make sure test data is larger than max read size
|
|
584 |
self.assertTrue(self.test_data_len > self.block_size) |
|
585 |
||
586 |
# retrieve data in blocks
|
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
587 |
from_file = file_utils.FakeReadFile(self.test_data) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
588 |
to_file = StringIO() |
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
589 |
osutils.pumpfile(from_file, to_file, self.test_data_len, |
590 |
self.block_size) |
|
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
591 |
|
592 |
# verify read size was equal to the maximum read size
|
|
593 |
self.assertTrue(from_file.get_max_read_size() > 0) |
|
594 |
self.assertEqual(from_file.get_max_read_size(), self.block_size) |
|
595 |
self.assertEqual(from_file.get_read_count(), 3) |
|
596 |
||
597 |
# report error if the data wasn't equal (we only report the size due
|
|
598 |
# to the length of the data)
|
|
599 |
response_data = to_file.getvalue() |
|
600 |
if response_data != self.test_data: |
|
601 |
message = "Data not equal. Expected %d bytes, received %d." |
|
602 |
self.fail(message % (len(response_data), self.test_data_len)) |
|
603 |
||
604 |
def test_to_eof(self): |
|
605 |
"""Read to end-of-file and verify that the reads are not larger than
|
|
606 |
the maximum read size."""
|
|
607 |
# make sure test data is larger than max read size
|
|
608 |
self.assertTrue(self.test_data_len > self.block_size) |
|
609 |
||
610 |
# retrieve data to EOF
|
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
611 |
from_file = file_utils.FakeReadFile(self.test_data) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
612 |
to_file = StringIO() |
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
613 |
osutils.pumpfile(from_file, to_file, -1, self.block_size) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
614 |
|
615 |
# verify read size was equal to the maximum read size
|
|
616 |
self.assertEqual(from_file.get_max_read_size(), self.block_size) |
|
617 |
self.assertEqual(from_file.get_read_count(), 4) |
|
618 |
||
619 |
# report error if the data wasn't equal (we only report the size due
|
|
620 |
# to the length of the data)
|
|
621 |
response_data = to_file.getvalue() |
|
622 |
if response_data != self.test_data: |
|
623 |
message = "Data not equal. Expected %d bytes, received %d." |
|
624 |
self.fail(message % (len(response_data), self.test_data_len)) |
|
625 |
||
626 |
def test_defaults(self): |
|
627 |
"""Verifies that the default arguments will read to EOF -- this
|
|
628 |
test verifies that any existing usages of pumpfile will not be broken
|
|
629 |
with this new version."""
|
|
630 |
# retrieve data using default (old) pumpfile method
|
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
631 |
from_file = file_utils.FakeReadFile(self.test_data) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
632 |
to_file = StringIO() |
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
633 |
osutils.pumpfile(from_file, to_file) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
634 |
|
635 |
# report error if the data wasn't equal (we only report the size due
|
|
636 |
# to the length of the data)
|
|
637 |
response_data = to_file.getvalue() |
|
638 |
if response_data != self.test_data: |
|
639 |
message = "Data not equal. Expected %d bytes, received %d." |
|
640 |
self.fail(message % (len(response_data), self.test_data_len)) |
|
641 |
||
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
642 |
def test_report_activity(self): |
643 |
activity = [] |
|
644 |
def log_activity(length, direction): |
|
645 |
activity.append((length, direction)) |
|
646 |
from_file = StringIO(self.test_data) |
|
647 |
to_file = StringIO() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
648 |
osutils.pumpfile(from_file, to_file, buff_size=500, |
649 |
report_activity=log_activity, direction='read') |
|
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
650 |
self.assertEqual([(500, 'read'), (500, 'read'), (500, 'read'), |
651 |
(36, 'read')], activity) |
|
652 |
||
653 |
from_file = StringIO(self.test_data) |
|
654 |
to_file = StringIO() |
|
655 |
del activity[:] |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
656 |
osutils.pumpfile(from_file, to_file, buff_size=500, |
657 |
report_activity=log_activity, direction='write') |
|
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
658 |
self.assertEqual([(500, 'write'), (500, 'write'), (500, 'write'), |
659 |
(36, 'write')], activity) |
|
660 |
||
661 |
# And with a limited amount of data
|
|
662 |
from_file = StringIO(self.test_data) |
|
663 |
to_file = StringIO() |
|
664 |
del activity[:] |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
665 |
osutils.pumpfile(from_file, to_file, buff_size=500, read_length=1028, |
666 |
report_activity=log_activity, direction='read') |
|
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
667 |
self.assertEqual([(500, 'read'), (500, 'read'), (28, 'read')], activity) |
668 |
||
669 |
||
3635.1.2
by Robert Collins
Add osutils.pump_string_file helper function. |
670 |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
671 |
class TestPumpStringFile(tests.TestCase): |
3635.1.2
by Robert Collins
Add osutils.pump_string_file helper function. |
672 |
|
673 |
def test_empty(self): |
|
674 |
output = StringIO() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
675 |
osutils.pump_string_file("", output) |
3635.1.2
by Robert Collins
Add osutils.pump_string_file helper function. |
676 |
self.assertEqual("", output.getvalue()) |
677 |
||
678 |
def test_more_than_segment_size(self): |
|
679 |
output = StringIO() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
680 |
osutils.pump_string_file("123456789", output, 2) |
3635.1.2
by Robert Collins
Add osutils.pump_string_file helper function. |
681 |
self.assertEqual("123456789", output.getvalue()) |
682 |
||
683 |
def test_segment_size(self): |
|
684 |
output = StringIO() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
685 |
osutils.pump_string_file("12", output, 2) |
3635.1.2
by Robert Collins
Add osutils.pump_string_file helper function. |
686 |
self.assertEqual("12", output.getvalue()) |
687 |
||
688 |
def test_segment_size_multiple(self): |
|
689 |
output = StringIO() |
|
4241.9.3
by Vincent Ladeuil
Fix two more test failures specific to OSX. |
690 |
osutils.pump_string_file("1234", output, 2) |
3635.1.2
by Robert Collins
Add osutils.pump_string_file helper function. |
691 |
self.assertEqual("1234", output.getvalue()) |
692 |
||
693 |
||
4555.2.1
by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop. |
694 |
class TestRelpath(tests.TestCase): |
695 |
||
696 |
def test_simple_relpath(self): |
|
697 |
cwd = osutils.getcwd() |
|
698 |
subdir = cwd + '/subdir' |
|
699 |
self.assertEqual('subdir', osutils.relpath(cwd, subdir)) |
|
700 |
||
4555.2.3
by John Arbash Meinel
Fix a trivial bug that should have been caught earlier. :) |
701 |
def test_deep_relpath(self): |
702 |
cwd = osutils.getcwd() |
|
703 |
subdir = cwd + '/sub/subsubdir' |
|
704 |
self.assertEqual('sub/subsubdir', osutils.relpath(cwd, subdir)) |
|
705 |
||
4555.2.1
by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop. |
706 |
def test_not_relative(self): |
707 |
self.assertRaises(errors.PathNotChild, |
|
708 |
osutils.relpath, 'C:/path', 'H:/path') |
|
709 |
self.assertRaises(errors.PathNotChild, |
|
710 |
osutils.relpath, 'C:/', 'H:/path') |
|
711 |
||
712 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
713 |
class TestSafeUnicode(tests.TestCase): |
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
714 |
|
715 |
def test_from_ascii_string(self): |
|
716 |
self.assertEqual(u'foobar', osutils.safe_unicode('foobar')) |
|
717 |
||
1534.3.2
by Robert Collins
An extra test for John. |
718 |
def test_from_unicode_string_ascii_contents(self): |
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
719 |
self.assertEqual(u'bargam', osutils.safe_unicode(u'bargam')) |
720 |
||
1534.3.2
by Robert Collins
An extra test for John. |
721 |
def test_from_unicode_string_unicode_contents(self): |
722 |
self.assertEqual(u'bargam\xae', osutils.safe_unicode(u'bargam\xae')) |
|
723 |
||
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
724 |
def test_from_utf8_string(self): |
725 |
self.assertEqual(u'foo\xae', osutils.safe_unicode('foo\xc2\xae')) |
|
726 |
||
727 |
def test_bad_utf8_string(self): |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
728 |
self.assertRaises(errors.BzrBadParameterNotUnicode, |
1185.65.29
by Robert Collins
Implement final review suggestions. |
729 |
osutils.safe_unicode, |
730 |
'\xbb\xbb') |
|
1666.1.6
by Robert Collins
Make knit the default format. |
731 |
|
732 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
733 |
class TestSafeUtf8(tests.TestCase): |
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
734 |
|
735 |
def test_from_ascii_string(self): |
|
736 |
f = 'foobar' |
|
737 |
self.assertEqual('foobar', osutils.safe_utf8(f)) |
|
738 |
||
739 |
def test_from_unicode_string_ascii_contents(self): |
|
740 |
self.assertEqual('bargam', osutils.safe_utf8(u'bargam')) |
|
741 |
||
742 |
def test_from_unicode_string_unicode_contents(self): |
|
743 |
self.assertEqual('bargam\xc2\xae', osutils.safe_utf8(u'bargam\xae')) |
|
744 |
||
745 |
def test_from_utf8_string(self): |
|
746 |
self.assertEqual('foo\xc2\xae', osutils.safe_utf8('foo\xc2\xae')) |
|
747 |
||
748 |
def test_bad_utf8_string(self): |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
749 |
self.assertRaises(errors.BzrBadParameterNotUnicode, |
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
750 |
osutils.safe_utf8, '\xbb\xbb') |
751 |
||
752 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
753 |
class TestSafeRevisionId(tests.TestCase): |
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
754 |
|
755 |
def test_from_ascii_string(self): |
|
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
756 |
# this shouldn't give a warning because it's getting an ascii string
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
757 |
self.assertEqual('foobar', osutils.safe_revision_id('foobar')) |
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
758 |
|
759 |
def test_from_unicode_string_ascii_contents(self): |
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
760 |
self.assertEqual('bargam', |
761 |
osutils.safe_revision_id(u'bargam', warn=False)) |
|
762 |
||
763 |
def test_from_unicode_deprecated(self): |
|
764 |
self.assertEqual('bargam', |
|
765 |
self.callDeprecated([osutils._revision_id_warning], |
|
766 |
osutils.safe_revision_id, u'bargam')) |
|
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
767 |
|
768 |
def test_from_unicode_string_unicode_contents(self): |
|
769 |
self.assertEqual('bargam\xc2\xae', |
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
770 |
osutils.safe_revision_id(u'bargam\xae', warn=False)) |
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
771 |
|
772 |
def test_from_utf8_string(self): |
|
773 |
self.assertEqual('foo\xc2\xae', |
|
774 |
osutils.safe_revision_id('foo\xc2\xae')) |
|
775 |
||
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
776 |
def test_none(self): |
777 |
"""Currently, None is a valid revision_id"""
|
|
778 |
self.assertEqual(None, osutils.safe_revision_id(None)) |
|
779 |
||
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
780 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
781 |
class TestSafeFileId(tests.TestCase): |
2294.1.4
by John Arbash Meinel
Add safe_file_id as a helper in osutils. |
782 |
|
783 |
def test_from_ascii_string(self): |
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
784 |
self.assertEqual('foobar', osutils.safe_file_id('foobar')) |
2294.1.4
by John Arbash Meinel
Add safe_file_id as a helper in osutils. |
785 |
|
786 |
def test_from_unicode_string_ascii_contents(self): |
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
787 |
self.assertEqual('bargam', osutils.safe_file_id(u'bargam', warn=False)) |
788 |
||
789 |
def test_from_unicode_deprecated(self): |
|
790 |
self.assertEqual('bargam', |
|
791 |
self.callDeprecated([osutils._file_id_warning], |
|
792 |
osutils.safe_file_id, u'bargam')) |
|
2294.1.4
by John Arbash Meinel
Add safe_file_id as a helper in osutils. |
793 |
|
794 |
def test_from_unicode_string_unicode_contents(self): |
|
795 |
self.assertEqual('bargam\xc2\xae', |
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
796 |
osutils.safe_file_id(u'bargam\xae', warn=False)) |
2294.1.4
by John Arbash Meinel
Add safe_file_id as a helper in osutils. |
797 |
|
798 |
def test_from_utf8_string(self): |
|
799 |
self.assertEqual('foo\xc2\xae', |
|
800 |
osutils.safe_file_id('foo\xc2\xae')) |
|
801 |
||
802 |
def test_none(self): |
|
803 |
"""Currently, None is a valid revision_id"""
|
|
804 |
self.assertEqual(None, osutils.safe_file_id(None)) |
|
805 |
||
806 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
807 |
class TestWin32Funcs(tests.TestCase): |
808 |
"""Test that _win32 versions of os utilities return appropriate paths."""
|
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
809 |
|
810 |
def test_abspath(self): |
|
811 |
self.assertEqual('C:/foo', osutils._win32_abspath('C:\\foo')) |
|
812 |
self.assertEqual('C:/foo', osutils._win32_abspath('C:/foo')) |
|
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
813 |
self.assertEqual('//HOST/path', osutils._win32_abspath(r'\\HOST\path')) |
814 |
self.assertEqual('//HOST/path', osutils._win32_abspath('//HOST/path')) |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
815 |
|
816 |
def test_realpath(self): |
|
817 |
self.assertEqual('C:/foo', osutils._win32_realpath('C:\\foo')) |
|
818 |
self.assertEqual('C:/foo', osutils._win32_realpath('C:/foo')) |
|
819 |
||
820 |
def test_pathjoin(self): |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
821 |
self.assertEqual('path/to/foo', |
822 |
osutils._win32_pathjoin('path', 'to', 'foo')) |
|
823 |
self.assertEqual('C:/foo', |
|
824 |
osutils._win32_pathjoin('path\\to', 'C:\\foo')) |
|
825 |
self.assertEqual('C:/foo', |
|
826 |
osutils._win32_pathjoin('path/to', 'C:/foo')) |
|
827 |
self.assertEqual('path/to/foo', |
|
828 |
osutils._win32_pathjoin('path/to/', 'foo')) |
|
829 |
self.assertEqual('/foo', |
|
830 |
osutils._win32_pathjoin('C:/path/to/', '/foo')) |
|
831 |
self.assertEqual('/foo', |
|
832 |
osutils._win32_pathjoin('C:\\path\\to\\', '\\foo')) |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
833 |
|
834 |
def test_normpath(self): |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
835 |
self.assertEqual('path/to/foo', |
836 |
osutils._win32_normpath(r'path\\from\..\to\.\foo')) |
|
837 |
self.assertEqual('path/to/foo', |
|
838 |
osutils._win32_normpath('path//from/../to/./foo')) |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
839 |
|
840 |
def test_getcwd(self): |
|
1711.5.2
by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this |
841 |
cwd = osutils._win32_getcwd() |
842 |
os_cwd = os.getcwdu() |
|
843 |
self.assertEqual(os_cwd[1:].replace('\\', '/'), cwd[1:]) |
|
844 |
# win32 is inconsistent whether it returns lower or upper case
|
|
845 |
# and even if it was consistent the user might type the other
|
|
846 |
# so we force it to uppercase
|
|
847 |
# running python.exe under cmd.exe return capital C:\\
|
|
848 |
# running win32 python inside a cygwin shell returns lowercase
|
|
849 |
self.assertEqual(os_cwd[0].upper(), cwd[0]) |
|
850 |
||
851 |
def test_fixdrive(self): |
|
852 |
self.assertEqual('H:/foo', osutils._win32_fixdrive('h:/foo')) |
|
853 |
self.assertEqual('H:/foo', osutils._win32_fixdrive('H:/foo')) |
|
854 |
self.assertEqual('C:\\foo', osutils._win32_fixdrive('c:\\foo')) |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
855 |
|
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
856 |
def test_win98_abspath(self): |
857 |
# absolute path
|
|
858 |
self.assertEqual('C:/foo', osutils._win98_abspath('C:\\foo')) |
|
859 |
self.assertEqual('C:/foo', osutils._win98_abspath('C:/foo')) |
|
860 |
# UNC path
|
|
861 |
self.assertEqual('//HOST/path', osutils._win98_abspath(r'\\HOST\path')) |
|
862 |
self.assertEqual('//HOST/path', osutils._win98_abspath('//HOST/path')) |
|
863 |
# relative path
|
|
864 |
cwd = osutils.getcwd().rstrip('/') |
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
865 |
drive = osutils.ntpath.splitdrive(cwd)[0] |
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
866 |
self.assertEqual(cwd+'/path', osutils._win98_abspath('path')) |
867 |
self.assertEqual(drive+'/path', osutils._win98_abspath('/path')) |
|
868 |
# unicode path
|
|
869 |
u = u'\u1234' |
|
870 |
self.assertEqual(cwd+'/'+u, osutils._win98_abspath(u)) |
|
871 |
||
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
872 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
873 |
class TestWin32FuncsDirs(tests.TestCaseInTempDir): |
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
874 |
"""Test win32 functions that create files."""
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
875 |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
876 |
def test_getcwd(self): |
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
877 |
self.requireFeature(tests.UnicodeFilenameFeature) |
878 |
os.mkdir(u'mu-\xb5') |
|
1830.3.9
by John Arbash Meinel
Use a directory name that doesn't get messed up on Mac for getcwd() test. |
879 |
os.chdir(u'mu-\xb5') |
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
880 |
# TODO: jam 20060427 This will probably fail on Mac OSX because
|
881 |
# it will change the normalization of B\xe5gfors
|
|
882 |
# Consider using a different unicode character, or make
|
|
883 |
# osutils.getcwd() renormalize the path.
|
|
1830.3.9
by John Arbash Meinel
Use a directory name that doesn't get messed up on Mac for getcwd() test. |
884 |
self.assertEndsWith(osutils._win32_getcwd(), u'mu-\xb5') |
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
885 |
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
886 |
def test_minimum_path_selection(self): |
887 |
self.assertEqual(set(), |
|
888 |
osutils.minimum_path_selection([])) |
|
4325.3.7
by Johan Walles
Style fixes for minimum_path_selection(). |
889 |
self.assertEqual(set(['a']), |
890 |
osutils.minimum_path_selection(['a'])) |
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
891 |
self.assertEqual(set(['a', 'b']), |
892 |
osutils.minimum_path_selection(['a', 'b'])) |
|
893 |
self.assertEqual(set(['a/', 'b']), |
|
894 |
osutils.minimum_path_selection(['a/', 'b'])) |
|
895 |
self.assertEqual(set(['a/', 'b']), |
|
896 |
osutils.minimum_path_selection(['a/c', 'a/', 'b'])) |
|
4325.3.3
by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with |
897 |
self.assertEqual(set(['a-b', 'a', 'a0b']), |
898 |
osutils.minimum_path_selection(['a-b', 'a/b', 'a0b', 'a'])) |
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
899 |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
900 |
def test_mkdtemp(self): |
901 |
tmpdir = osutils._win32_mkdtemp(dir='.') |
|
902 |
self.assertFalse('\\' in tmpdir) |
|
903 |
||
904 |
def test_rename(self): |
|
905 |
a = open('a', 'wb') |
|
906 |
a.write('foo\n') |
|
907 |
a.close() |
|
908 |
b = open('b', 'wb') |
|
909 |
b.write('baz\n') |
|
910 |
b.close() |
|
911 |
||
912 |
osutils._win32_rename('b', 'a') |
|
913 |
self.failUnlessExists('a') |
|
914 |
self.failIfExists('b') |
|
915 |
self.assertFileEqual('baz\n', 'a') |
|
916 |
||
1711.7.6
by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming. |
917 |
def test_rename_missing_file(self): |
918 |
a = open('a', 'wb') |
|
919 |
a.write('foo\n') |
|
920 |
a.close() |
|
921 |
||
922 |
try: |
|
923 |
osutils._win32_rename('b', 'a') |
|
924 |
except (IOError, OSError), e: |
|
925 |
self.assertEqual(errno.ENOENT, e.errno) |
|
926 |
self.assertFileEqual('foo\n', 'a') |
|
927 |
||
928 |
def test_rename_missing_dir(self): |
|
929 |
os.mkdir('a') |
|
930 |
try: |
|
931 |
osutils._win32_rename('b', 'a') |
|
932 |
except (IOError, OSError), e: |
|
933 |
self.assertEqual(errno.ENOENT, e.errno) |
|
934 |
||
935 |
def test_rename_current_dir(self): |
|
936 |
os.mkdir('a') |
|
937 |
os.chdir('a') |
|
938 |
# You can't rename the working directory
|
|
939 |
# doing rename non-existant . usually
|
|
940 |
# just raises ENOENT, since non-existant
|
|
941 |
# doesn't exist.
|
|
942 |
try: |
|
943 |
osutils._win32_rename('b', '.') |
|
944 |
except (IOError, OSError), e: |
|
945 |
self.assertEqual(errno.ENOENT, e.errno) |
|
946 |
||
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
947 |
def test_splitpath(self): |
948 |
def check(expected, path): |
|
949 |
self.assertEqual(expected, osutils.splitpath(path)) |
|
950 |
||
951 |
check(['a'], 'a') |
|
952 |
check(['a', 'b'], 'a/b') |
|
953 |
check(['a', 'b'], 'a/./b') |
|
954 |
check(['a', '.b'], 'a/.b') |
|
955 |
check(['a', '.b'], 'a\\.b') |
|
956 |
||
957 |
self.assertRaises(errors.BzrError, osutils.splitpath, 'a/../b') |
|
958 |
||
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
959 |
|
4370.1.1
by Ian Clatworthy
add osutils.parent_directories() API |
960 |
class TestParentDirectories(tests.TestCaseInTempDir): |
961 |
"""Test osutils.parent_directories()"""
|
|
962 |
||
963 |
def test_parent_directories(self): |
|
964 |
self.assertEqual([], osutils.parent_directories('a')) |
|
965 |
self.assertEqual(['a'], osutils.parent_directories('a/b')) |
|
966 |
self.assertEqual(['a/b', 'a'], osutils.parent_directories('a/b/c')) |
|
967 |
||
968 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
969 |
class TestMacFuncsDirs(tests.TestCaseInTempDir): |
1830.3.11
by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path. |
970 |
"""Test mac special functions that require directories."""
|
971 |
||
972 |
def test_getcwd(self): |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
973 |
self.requireFeature(tests.UnicodeFilenameFeature) |
974 |
os.mkdir(u'B\xe5gfors') |
|
1830.3.11
by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path. |
975 |
os.chdir(u'B\xe5gfors') |
976 |
self.assertEndsWith(osutils._mac_getcwd(), u'B\xe5gfors') |
|
977 |
||
978 |
def test_getcwd_nonnorm(self): |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
979 |
self.requireFeature(tests.UnicodeFilenameFeature) |
1830.3.11
by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path. |
980 |
# Test that _mac_getcwd() will normalize this path
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
981 |
os.mkdir(u'Ba\u030agfors') |
1830.3.11
by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path. |
982 |
os.chdir(u'Ba\u030agfors') |
983 |
self.assertEndsWith(osutils._mac_getcwd(), u'B\xe5gfors') |
|
984 |
||
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
985 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
986 |
class TestChunksToLines(tests.TestCase): |
3890.2.4
by John Arbash Meinel
Add a new function that can convert 'chunks' format to a 'lines' format. |
987 |
|
3890.2.8
by John Arbash Meinel
Move everything into properly parameterized tests. |
988 |
def test_smoketest(self): |
989 |
self.assertEqual(['foo\n', 'bar\n', 'baz\n'], |
|
990 |
osutils.chunks_to_lines(['foo\nbar', '\nbaz\n'])) |
|
991 |
self.assertEqual(['foo\n', 'bar\n', 'baz\n'], |
|
992 |
osutils.chunks_to_lines(['foo\n', 'bar\n', 'baz\n'])) |
|
993 |
||
3734.2.21
by Vincent Ladeuil
Give test a better name. |
994 |
def test_osutils_binding(self): |
3734.2.20
by Vincent Ladeuil
Fix failing test when CompiledChunksToLines is not available. |
995 |
from bzrlib.tests import test__chunks_to_lines |
4913.2.26
by John Arbash Meinel
A bunch of osutils tests depended on features being available. |
996 |
if test__chunks_to_lines.compiled_chunkstolines_feature.available(): |
3890.2.8
by John Arbash Meinel
Move everything into properly parameterized tests. |
997 |
from bzrlib._chunks_to_lines_pyx import chunks_to_lines |
998 |
else: |
|
999 |
from bzrlib._chunks_to_lines_py import chunks_to_lines |
|
1000 |
self.assertIs(chunks_to_lines, osutils.chunks_to_lines) |
|
3890.2.5
by John Arbash Meinel
More tests for edge cases. |
1001 |
|
3890.2.4
by John Arbash Meinel
Add a new function that can convert 'chunks' format to a 'lines' format. |
1002 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1003 |
class TestSplitLines(tests.TestCase): |
1666.1.6
by Robert Collins
Make knit the default format. |
1004 |
|
1005 |
def test_split_unicode(self): |
|
1006 |
self.assertEqual([u'foo\n', u'bar\xae'], |
|
1007 |
osutils.split_lines(u'foo\nbar\xae')) |
|
1008 |
self.assertEqual([u'foo\n', u'bar\xae\n'], |
|
1009 |
osutils.split_lines(u'foo\nbar\xae\n')) |
|
1010 |
||
1011 |
def test_split_with_carriage_returns(self): |
|
1012 |
self.assertEqual(['foo\rbar\n'], |
|
1013 |
osutils.split_lines('foo\rbar\n')) |
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1014 |
|
1015 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1016 |
class TestWalkDirs(tests.TestCaseInTempDir): |
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1017 |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1018 |
def assertExpectedBlocks(self, expected, result): |
1019 |
self.assertEqual(expected, |
|
1020 |
[(dirinfo, [line[0:3] for line in block]) |
|
1021 |
for dirinfo, block in result]) |
|
1022 |
||
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1023 |
def test_walkdirs(self): |
1024 |
tree = [ |
|
1025 |
'.bzr', |
|
1026 |
'0file', |
|
1027 |
'1dir/', |
|
1028 |
'1dir/0file', |
|
1029 |
'1dir/1dir/', |
|
1030 |
'2file'
|
|
1031 |
]
|
|
1032 |
self.build_tree(tree) |
|
1033 |
expected_dirblocks = [ |
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1034 |
(('', '.'), |
1035 |
[('0file', '0file', 'file'), |
|
1036 |
('1dir', '1dir', 'directory'), |
|
1037 |
('2file', '2file', 'file'), |
|
1038 |
]
|
|
1039 |
),
|
|
1040 |
(('1dir', './1dir'), |
|
1041 |
[('1dir/0file', '0file', 'file'), |
|
1042 |
('1dir/1dir', '1dir', 'directory'), |
|
1043 |
]
|
|
1044 |
),
|
|
1045 |
(('1dir/1dir', './1dir/1dir'), |
|
1046 |
[
|
|
1047 |
]
|
|
1048 |
),
|
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1049 |
]
|
1050 |
result = [] |
|
1051 |
found_bzrdir = False |
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1052 |
for dirdetail, dirblock in osutils.walkdirs('.'): |
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1053 |
if len(dirblock) and dirblock[0][1] == '.bzr': |
1054 |
# this tests the filtering of selected paths
|
|
1055 |
found_bzrdir = True |
|
1056 |
del dirblock[0] |
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1057 |
result.append((dirdetail, dirblock)) |
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1058 |
|
1059 |
self.assertTrue(found_bzrdir) |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1060 |
self.assertExpectedBlocks(expected_dirblocks, result) |
1757.2.8
by Robert Collins
Teach walkdirs to walk a subdir of a tree. |
1061 |
# you can search a subdir only, with a supplied prefix.
|
1062 |
result = [] |
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1063 |
for dirblock in osutils.walkdirs('./1dir', '1dir'): |
1757.2.8
by Robert Collins
Teach walkdirs to walk a subdir of a tree. |
1064 |
result.append(dirblock) |
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1065 |
self.assertExpectedBlocks(expected_dirblocks[1:], result) |
1757.2.8
by Robert Collins
Teach walkdirs to walk a subdir of a tree. |
1066 |
|
4095.1.3
by Martin Pool
Add test for failures inside pyrex readdir |
1067 |
def test_walkdirs_os_error(self): |
5243.1.2
by Martin
Point launchpad links in comments at production server rather than edge |
1068 |
# <https://bugs.launchpad.net/bzr/+bug/338653>
|
4095.1.3
by Martin Pool
Add test for failures inside pyrex readdir |
1069 |
# Pyrex readdir didn't raise useful messages if it had an error
|
1070 |
# reading the directory
|
|
1071 |
if sys.platform == 'win32': |
|
1072 |
raise tests.TestNotApplicable( |
|
1073 |
"readdir IOError not tested on win32") |
|
4797.70.1
by Vincent Ladeuil
Skip chmodbits dependent tests when running as root |
1074 |
self.requireFeature(features.not_running_as_root) |
4095.1.3
by Martin Pool
Add test for failures inside pyrex readdir |
1075 |
os.mkdir("test-unreadable") |
1076 |
os.chmod("test-unreadable", 0000) |
|
1077 |
# must chmod it back so that it can be removed
|
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
1078 |
self.addCleanup(os.chmod, "test-unreadable", 0700) |
4095.1.3
by Martin Pool
Add test for failures inside pyrex readdir |
1079 |
# The error is not raised until the generator is actually evaluated.
|
1080 |
# (It would be ok if it happened earlier but at the moment it
|
|
1081 |
# doesn't.)
|
|
4133.1.1
by Vincent Ladeuil
Fix bzrlib.tests.test_osutils.TestWalkDirs.test_walkdirs_os_error |
1082 |
e = self.assertRaises(OSError, list, osutils._walkdirs_utf8(".")) |
1083 |
self.assertEquals('./test-unreadable', e.filename) |
|
1084 |
self.assertEquals(errno.EACCES, e.errno) |
|
4133.1.2
by Vincent Ladeuil
Fixed as per Martin's remark about the intent of the test :-} |
1085 |
# Ensure the message contains the file name
|
1086 |
self.assertContainsRe(str(e), "\./test-unreadable") |
|
4095.1.3
by Martin Pool
Add test for failures inside pyrex readdir |
1087 |
|
5279.2.5
by Eric Moritz
added a test to make sure that BadFilenameEncoding is thrown |
1088 |
|
1089 |
def test_walkdirs_encoding_error(self): |
|
1090 |
# <https://bugs.launchpad.net/bzr/+bug/488519>
|
|
1091 |
# walkdirs didn't raise a useful message when the filenames
|
|
5279.2.8
by Eric Moritz
1. used os.rename instead of shutil.move |
1092 |
# are not using the filesystem's encoding
|
1093 |
||
5279.2.11
by Eric Moritz
Utilized the ByteStringNamedFilesystem per Martin Pool's request |
1094 |
# require a bytestring based filesystem
|
5279.2.12
by Eric Moritz
Deleted trailing whitespace |
1095 |
self.requireFeature(tests.ByteStringNamedFilesystem) |
5279.2.8
by Eric Moritz
1. used os.rename instead of shutil.move |
1096 |
|
5279.2.5
by Eric Moritz
added a test to make sure that BadFilenameEncoding is thrown |
1097 |
tree = [ |
1098 |
'.bzr', |
|
1099 |
'0file', |
|
1100 |
'1dir/', |
|
1101 |
'1dir/0file', |
|
1102 |
'1dir/1dir/', |
|
1103 |
'1file'
|
|
1104 |
]
|
|
1105 |
||
1106 |
self.build_tree(tree) |
|
1107 |
||
1108 |
# rename the 1file to a latin-1 filename
|
|
5279.2.8
by Eric Moritz
1. used os.rename instead of shutil.move |
1109 |
os.rename("./1file", "\xe8file") |
5279.2.5
by Eric Moritz
added a test to make sure that BadFilenameEncoding is thrown |
1110 |
|
1111 |
self._save_platform_info() |
|
1112 |
win32utils.winver = None # Avoid the win32 detection code |
|
1113 |
osutils._fs_enc = 'UTF-8' |
|
1114 |
||
1115 |
# this should raise on error
|
|
1116 |
def attempt(): |
|
1117 |
for dirdetail, dirblock in osutils.walkdirs('.'): |
|
1118 |
pass
|
|
1119 |
||
1120 |
self.assertRaises(errors.BadFilenameEncoding, attempt) |
|
1121 |
||
2255.7.27
by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems |
1122 |
def test__walkdirs_utf8(self): |
1123 |
tree = [ |
|
1124 |
'.bzr', |
|
1125 |
'0file', |
|
1126 |
'1dir/', |
|
1127 |
'1dir/0file', |
|
1128 |
'1dir/1dir/', |
|
1129 |
'2file'
|
|
1130 |
]
|
|
1131 |
self.build_tree(tree) |
|
1132 |
expected_dirblocks = [ |
|
1133 |
(('', '.'), |
|
1134 |
[('0file', '0file', 'file'), |
|
1135 |
('1dir', '1dir', 'directory'), |
|
1136 |
('2file', '2file', 'file'), |
|
1137 |
]
|
|
1138 |
),
|
|
1139 |
(('1dir', './1dir'), |
|
1140 |
[('1dir/0file', '0file', 'file'), |
|
1141 |
('1dir/1dir', '1dir', 'directory'), |
|
1142 |
]
|
|
1143 |
),
|
|
1144 |
(('1dir/1dir', './1dir/1dir'), |
|
1145 |
[
|
|
1146 |
]
|
|
1147 |
),
|
|
1148 |
]
|
|
1149 |
result = [] |
|
1150 |
found_bzrdir = False |
|
1151 |
for dirdetail, dirblock in osutils._walkdirs_utf8('.'): |
|
1152 |
if len(dirblock) and dirblock[0][1] == '.bzr': |
|
1153 |
# this tests the filtering of selected paths
|
|
1154 |
found_bzrdir = True |
|
1155 |
del dirblock[0] |
|
1156 |
result.append((dirdetail, dirblock)) |
|
1157 |
||
1158 |
self.assertTrue(found_bzrdir) |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1159 |
self.assertExpectedBlocks(expected_dirblocks, result) |
1160 |
||
2255.7.27
by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems |
1161 |
# you can search a subdir only, with a supplied prefix.
|
1162 |
result = [] |
|
1163 |
for dirblock in osutils.walkdirs('./1dir', '1dir'): |
|
1164 |
result.append(dirblock) |
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1165 |
self.assertExpectedBlocks(expected_dirblocks[1:], result) |
2255.7.27
by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems |
1166 |
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1167 |
def _filter_out_stat(self, result): |
1168 |
"""Filter out the stat value from the walkdirs result"""
|
|
1169 |
for dirdetail, dirblock in result: |
|
1170 |
new_dirblock = [] |
|
1171 |
for info in dirblock: |
|
1172 |
# Ignore info[3] which is the stat
|
|
1173 |
new_dirblock.append((info[0], info[1], info[2], info[4])) |
|
1174 |
dirblock[:] = new_dirblock |
|
1175 |
||
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1176 |
def _save_platform_info(self): |
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1177 |
self.overrideAttr(win32utils, 'winver') |
1178 |
self.overrideAttr(osutils, '_fs_enc') |
|
1179 |
self.overrideAttr(osutils, '_selected_dir_reader') |
|
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1180 |
|
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
1181 |
def assertDirReaderIs(self, expected): |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1182 |
"""Assert the right implementation for _walkdirs_utf8 is chosen."""
|
1183 |
# Force it to redetect
|
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1184 |
osutils._selected_dir_reader = None |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1185 |
# Nothing to list, but should still trigger the selection logic
|
3557.2.5
by John Arbash Meinel
Test that the empty-directory logic for all _walkdirs implementations is correct. |
1186 |
self.assertEqual([(('', '.'), [])], list(osutils._walkdirs_utf8('.'))) |
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1187 |
self.assertIsInstance(osutils._selected_dir_reader, expected) |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1188 |
|
1189 |
def test_force_walkdirs_utf8_fs_utf8(self): |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1190 |
self.requireFeature(UTF8DirReaderFeature) |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1191 |
self._save_platform_info() |
3557.2.6
by John Arbash Meinel
Switch from os.name to bzrlib.win32utils.winver. |
1192 |
win32utils.winver = None # Avoid the win32 detection code |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1193 |
osutils._fs_enc = 'UTF-8' |
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
1194 |
self.assertDirReaderIs(UTF8DirReaderFeature.reader) |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1195 |
|
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1196 |
def test_force_walkdirs_utf8_fs_ascii(self): |
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1197 |
self.requireFeature(UTF8DirReaderFeature) |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1198 |
self._save_platform_info() |
3557.2.6
by John Arbash Meinel
Switch from os.name to bzrlib.win32utils.winver. |
1199 |
win32utils.winver = None # Avoid the win32 detection code |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1200 |
osutils._fs_enc = 'US-ASCII' |
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
1201 |
self.assertDirReaderIs(UTF8DirReaderFeature.reader) |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1202 |
|
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1203 |
def test_force_walkdirs_utf8_fs_ANSI(self): |
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1204 |
self.requireFeature(UTF8DirReaderFeature) |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1205 |
self._save_platform_info() |
3557.2.6
by John Arbash Meinel
Switch from os.name to bzrlib.win32utils.winver. |
1206 |
win32utils.winver = None # Avoid the win32 detection code |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1207 |
osutils._fs_enc = 'ANSI_X3.4-1968' |
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
1208 |
self.assertDirReaderIs(UTF8DirReaderFeature.reader) |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1209 |
|
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1210 |
def test_force_walkdirs_utf8_fs_latin1(self): |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1211 |
self._save_platform_info() |
3557.2.6
by John Arbash Meinel
Switch from os.name to bzrlib.win32utils.winver. |
1212 |
win32utils.winver = None # Avoid the win32 detection code |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1213 |
osutils._fs_enc = 'latin1' |
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
1214 |
self.assertDirReaderIs(osutils.UnicodeDirReader) |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1215 |
|
1216 |
def test_force_walkdirs_utf8_nt(self): |
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1217 |
# Disabled because the thunk of the whole walkdirs api is disabled.
|
4913.2.26
by John Arbash Meinel
A bunch of osutils tests depended on features being available. |
1218 |
self.requireFeature(test__walkdirs_win32.win32_readdir_feature) |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1219 |
self._save_platform_info() |
3557.2.6
by John Arbash Meinel
Switch from os.name to bzrlib.win32utils.winver. |
1220 |
win32utils.winver = 'Windows NT' |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1221 |
from bzrlib._walkdirs_win32 import Win32ReadDir |
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
1222 |
self.assertDirReaderIs(Win32ReadDir) |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1223 |
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1224 |
def test_force_walkdirs_utf8_98(self): |
4913.2.26
by John Arbash Meinel
A bunch of osutils tests depended on features being available. |
1225 |
self.requireFeature(test__walkdirs_win32.win32_readdir_feature) |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1226 |
self._save_platform_info() |
3557.2.6
by John Arbash Meinel
Switch from os.name to bzrlib.win32utils.winver. |
1227 |
win32utils.winver = 'Windows 98' |
4241.14.5
by Vincent Ladeuil
Some more cleanup (without typo). |
1228 |
self.assertDirReaderIs(osutils.UnicodeDirReader) |
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1229 |
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1230 |
def test_unicode_walkdirs(self): |
1231 |
"""Walkdirs should always return unicode paths."""
|
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1232 |
self.requireFeature(tests.UnicodeFilenameFeature) |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1233 |
name0 = u'0file-\xb6' |
1234 |
name1 = u'1dir-\u062c\u0648' |
|
1235 |
name2 = u'2file-\u0633' |
|
1236 |
tree = [ |
|
1237 |
name0, |
|
1238 |
name1 + '/', |
|
1239 |
name1 + '/' + name0, |
|
1240 |
name1 + '/' + name1 + '/', |
|
1241 |
name2, |
|
1242 |
]
|
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1243 |
self.build_tree(tree) |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1244 |
expected_dirblocks = [ |
1245 |
((u'', u'.'), |
|
1246 |
[(name0, name0, 'file', './' + name0), |
|
1247 |
(name1, name1, 'directory', './' + name1), |
|
1248 |
(name2, name2, 'file', './' + name2), |
|
1249 |
]
|
|
1250 |
),
|
|
1251 |
((name1, './' + name1), |
|
1252 |
[(name1 + '/' + name0, name0, 'file', './' + name1 |
|
1253 |
+ '/' + name0), |
|
1254 |
(name1 + '/' + name1, name1, 'directory', './' + name1 |
|
1255 |
+ '/' + name1), |
|
1256 |
]
|
|
1257 |
),
|
|
1258 |
((name1 + '/' + name1, './' + name1 + '/' + name1), |
|
1259 |
[
|
|
1260 |
]
|
|
1261 |
),
|
|
1262 |
]
|
|
1263 |
result = list(osutils.walkdirs('.')) |
|
1264 |
self._filter_out_stat(result) |
|
1265 |
self.assertEqual(expected_dirblocks, result) |
|
1266 |
result = list(osutils.walkdirs(u'./'+name1, name1)) |
|
1267 |
self._filter_out_stat(result) |
|
1268 |
self.assertEqual(expected_dirblocks[1:], result) |
|
1269 |
||
1270 |
def test_unicode__walkdirs_utf8(self): |
|
1271 |
"""Walkdirs_utf8 should always return utf8 paths.
|
|
1272 |
||
1273 |
The abspath portion might be in unicode or utf-8
|
|
1274 |
"""
|
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1275 |
self.requireFeature(tests.UnicodeFilenameFeature) |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1276 |
name0 = u'0file-\xb6' |
1277 |
name1 = u'1dir-\u062c\u0648' |
|
1278 |
name2 = u'2file-\u0633' |
|
1279 |
tree = [ |
|
1280 |
name0, |
|
1281 |
name1 + '/', |
|
1282 |
name1 + '/' + name0, |
|
1283 |
name1 + '/' + name1 + '/', |
|
1284 |
name2, |
|
1285 |
]
|
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1286 |
self.build_tree(tree) |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1287 |
name0 = name0.encode('utf8') |
1288 |
name1 = name1.encode('utf8') |
|
1289 |
name2 = name2.encode('utf8') |
|
1290 |
||
1291 |
expected_dirblocks = [ |
|
1292 |
(('', '.'), |
|
1293 |
[(name0, name0, 'file', './' + name0), |
|
1294 |
(name1, name1, 'directory', './' + name1), |
|
1295 |
(name2, name2, 'file', './' + name2), |
|
1296 |
]
|
|
1297 |
),
|
|
1298 |
((name1, './' + name1), |
|
1299 |
[(name1 + '/' + name0, name0, 'file', './' + name1 |
|
1300 |
+ '/' + name0), |
|
1301 |
(name1 + '/' + name1, name1, 'directory', './' + name1 |
|
1302 |
+ '/' + name1), |
|
1303 |
]
|
|
1304 |
),
|
|
1305 |
((name1 + '/' + name1, './' + name1 + '/' + name1), |
|
1306 |
[
|
|
1307 |
]
|
|
1308 |
),
|
|
1309 |
]
|
|
1310 |
result = [] |
|
1311 |
# For ease in testing, if walkdirs_utf8 returns Unicode, assert that
|
|
1312 |
# all abspaths are Unicode, and encode them back into utf8.
|
|
1313 |
for dirdetail, dirblock in osutils._walkdirs_utf8('.'): |
|
1314 |
self.assertIsInstance(dirdetail[0], str) |
|
1315 |
if isinstance(dirdetail[1], unicode): |
|
2324.2.4
by Dmitry Vasiliev
Fixed test_unicode__walkdirs_utf8 test |
1316 |
dirdetail = (dirdetail[0], dirdetail[1].encode('utf8')) |
1317 |
dirblock = [list(info) for info in dirblock] |
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1318 |
for info in dirblock: |
1319 |
self.assertIsInstance(info[4], unicode) |
|
1320 |
info[4] = info[4].encode('utf8') |
|
1321 |
new_dirblock = [] |
|
1322 |
for info in dirblock: |
|
1323 |
self.assertIsInstance(info[0], str) |
|
1324 |
self.assertIsInstance(info[1], str) |
|
1325 |
self.assertIsInstance(info[4], str) |
|
1326 |
# Remove the stat information
|
|
1327 |
new_dirblock.append((info[0], info[1], info[2], info[4])) |
|
1328 |
result.append((dirdetail, new_dirblock)) |
|
1329 |
self.assertEqual(expected_dirblocks, result) |
|
1330 |
||
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1331 |
def test__walkdirs_utf8_with_unicode_fs(self): |
1332 |
"""UnicodeDirReader should be a safe fallback everywhere
|
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1333 |
|
1334 |
The abspath portion should be in unicode
|
|
1335 |
"""
|
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1336 |
self.requireFeature(tests.UnicodeFilenameFeature) |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1337 |
# Use the unicode reader. TODO: split into driver-and-driven unit
|
1338 |
# tests.
|
|
1339 |
self._save_platform_info() |
|
1340 |
osutils._selected_dir_reader = osutils.UnicodeDirReader() |
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1341 |
name0u = u'0file-\xb6' |
1342 |
name1u = u'1dir-\u062c\u0648' |
|
1343 |
name2u = u'2file-\u0633' |
|
1344 |
tree = [ |
|
1345 |
name0u, |
|
1346 |
name1u + '/', |
|
1347 |
name1u + '/' + name0u, |
|
1348 |
name1u + '/' + name1u + '/', |
|
1349 |
name2u, |
|
1350 |
]
|
|
4241.14.4
by Vincent Ladeuil
Clean up test_osutils.py. |
1351 |
self.build_tree(tree) |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1352 |
name0 = name0u.encode('utf8') |
1353 |
name1 = name1u.encode('utf8') |
|
1354 |
name2 = name2u.encode('utf8') |
|
1355 |
||
1356 |
# All of the abspaths should be in unicode, all of the relative paths
|
|
1357 |
# should be in utf8
|
|
1358 |
expected_dirblocks = [ |
|
1359 |
(('', '.'), |
|
1360 |
[(name0, name0, 'file', './' + name0u), |
|
1361 |
(name1, name1, 'directory', './' + name1u), |
|
1362 |
(name2, name2, 'file', './' + name2u), |
|
1363 |
]
|
|
1364 |
),
|
|
1365 |
((name1, './' + name1u), |
|
1366 |
[(name1 + '/' + name0, name0, 'file', './' + name1u |
|
1367 |
+ '/' + name0u), |
|
1368 |
(name1 + '/' + name1, name1, 'directory', './' + name1u |
|
1369 |
+ '/' + name1u), |
|
1370 |
]
|
|
1371 |
),
|
|
1372 |
((name1 + '/' + name1, './' + name1u + '/' + name1u), |
|
1373 |
[
|
|
1374 |
]
|
|
1375 |
),
|
|
1376 |
]
|
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1377 |
result = list(osutils._walkdirs_utf8('.')) |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1378 |
self._filter_out_stat(result) |
1379 |
self.assertEqual(expected_dirblocks, result) |
|
1380 |
||
3696.3.4
by John Arbash Meinel
Update the osutils test to find the objects in the right locations. |
1381 |
def test__walkdirs_utf8_win32readdir(self): |
4913.2.26
by John Arbash Meinel
A bunch of osutils tests depended on features being available. |
1382 |
self.requireFeature(test__walkdirs_win32.win32_readdir_feature) |
3504.4.1
by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis. |
1383 |
self.requireFeature(tests.UnicodeFilenameFeature) |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1384 |
from bzrlib._walkdirs_win32 import Win32ReadDir |
1385 |
self._save_platform_info() |
|
3696.3.4
by John Arbash Meinel
Update the osutils test to find the objects in the right locations. |
1386 |
osutils._selected_dir_reader = Win32ReadDir() |
3504.4.1
by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis. |
1387 |
name0u = u'0file-\xb6' |
1388 |
name1u = u'1dir-\u062c\u0648' |
|
1389 |
name2u = u'2file-\u0633' |
|
1390 |
tree = [ |
|
1391 |
name0u, |
|
1392 |
name1u + '/', |
|
1393 |
name1u + '/' + name0u, |
|
1394 |
name1u + '/' + name1u + '/', |
|
1395 |
name2u, |
|
1396 |
]
|
|
1397 |
self.build_tree(tree) |
|
1398 |
name0 = name0u.encode('utf8') |
|
1399 |
name1 = name1u.encode('utf8') |
|
1400 |
name2 = name2u.encode('utf8') |
|
1401 |
||
1402 |
# All of the abspaths should be in unicode, all of the relative paths
|
|
1403 |
# should be in utf8
|
|
1404 |
expected_dirblocks = [ |
|
1405 |
(('', '.'), |
|
1406 |
[(name0, name0, 'file', './' + name0u), |
|
1407 |
(name1, name1, 'directory', './' + name1u), |
|
1408 |
(name2, name2, 'file', './' + name2u), |
|
1409 |
]
|
|
1410 |
),
|
|
1411 |
((name1, './' + name1u), |
|
1412 |
[(name1 + '/' + name0, name0, 'file', './' + name1u |
|
1413 |
+ '/' + name0u), |
|
1414 |
(name1 + '/' + name1, name1, 'directory', './' + name1u |
|
1415 |
+ '/' + name1u), |
|
1416 |
]
|
|
1417 |
),
|
|
1418 |
((name1 + '/' + name1, './' + name1u + '/' + name1u), |
|
1419 |
[
|
|
1420 |
]
|
|
1421 |
),
|
|
1422 |
]
|
|
3696.3.4
by John Arbash Meinel
Update the osutils test to find the objects in the right locations. |
1423 |
result = list(osutils._walkdirs_utf8(u'.')) |
3504.4.1
by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis. |
1424 |
self._filter_out_stat(result) |
1425 |
self.assertEqual(expected_dirblocks, result) |
|
1426 |
||
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1427 |
def assertStatIsCorrect(self, path, win32stat): |
1428 |
os_stat = os.stat(path) |
|
1429 |
self.assertEqual(os_stat.st_size, win32stat.st_size) |
|
3504.4.6
by John Arbash Meinel
Start exposing the times on the stat, this now seems to be a complete walkdirs implementation. |
1430 |
self.assertAlmostEqual(os_stat.st_mtime, win32stat.st_mtime, places=4) |
1431 |
self.assertAlmostEqual(os_stat.st_ctime, win32stat.st_ctime, places=4) |
|
1432 |
self.assertAlmostEqual(os_stat.st_atime, win32stat.st_atime, places=4) |
|
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1433 |
self.assertEqual(os_stat.st_dev, win32stat.st_dev) |
1434 |
self.assertEqual(os_stat.st_ino, win32stat.st_ino) |
|
1435 |
self.assertEqual(os_stat.st_mode, win32stat.st_mode) |
|
1436 |
||
1437 |
def test__walkdirs_utf_win32_find_file_stat_file(self): |
|
1438 |
"""make sure our Stat values are valid"""
|
|
4913.2.26
by John Arbash Meinel
A bunch of osutils tests depended on features being available. |
1439 |
self.requireFeature(test__walkdirs_win32.win32_readdir_feature) |
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1440 |
self.requireFeature(tests.UnicodeFilenameFeature) |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1441 |
from bzrlib._walkdirs_win32 import Win32ReadDir |
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1442 |
name0u = u'0file-\xb6' |
1443 |
name0 = name0u.encode('utf8') |
|
1444 |
self.build_tree([name0u]) |
|
1445 |
# I hate to sleep() here, but I'm trying to make the ctime different
|
|
1446 |
# from the mtime
|
|
1447 |
time.sleep(2) |
|
1448 |
f = open(name0u, 'ab') |
|
1449 |
try: |
|
1450 |
f.write('just a small update') |
|
1451 |
finally: |
|
1452 |
f.close() |
|
1453 |
||
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1454 |
result = Win32ReadDir().read_dir('', u'.') |
1455 |
entry = result[0] |
|
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1456 |
self.assertEqual((name0, name0, 'file'), entry[:3]) |
1457 |
self.assertEqual(u'./' + name0u, entry[4]) |
|
1458 |
self.assertStatIsCorrect(entry[4], entry[3]) |
|
3504.4.6
by John Arbash Meinel
Start exposing the times on the stat, this now seems to be a complete walkdirs implementation. |
1459 |
self.assertNotEqual(entry[3].st_mtime, entry[3].st_ctime) |
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1460 |
|
1461 |
def test__walkdirs_utf_win32_find_file_stat_directory(self): |
|
1462 |
"""make sure our Stat values are valid"""
|
|
4913.2.26
by John Arbash Meinel
A bunch of osutils tests depended on features being available. |
1463 |
self.requireFeature(test__walkdirs_win32.win32_readdir_feature) |
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1464 |
self.requireFeature(tests.UnicodeFilenameFeature) |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1465 |
from bzrlib._walkdirs_win32 import Win32ReadDir |
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1466 |
name0u = u'0dir-\u062c\u0648' |
1467 |
name0 = name0u.encode('utf8') |
|
1468 |
self.build_tree([name0u + '/']) |
|
1469 |
||
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1470 |
result = Win32ReadDir().read_dir('', u'.') |
1471 |
entry = result[0] |
|
3504.4.2
by John Arbash Meinel
Add a test case that shows the mtime is not being returned correctly. |
1472 |
self.assertEqual((name0, name0, 'directory'), entry[:3]) |
1473 |
self.assertEqual(u'./' + name0u, entry[4]) |
|
1474 |
self.assertStatIsCorrect(entry[4], entry[3]) |
|
1475 |
||
1773.3.1
by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions. |
1476 |
def assertPathCompare(self, path_less, path_greater): |
1477 |
"""check that path_less and path_greater compare correctly."""
|
|
1478 |
self.assertEqual(0, osutils.compare_paths_prefix_order( |
|
1479 |
path_less, path_less)) |
|
1480 |
self.assertEqual(0, osutils.compare_paths_prefix_order( |
|
1481 |
path_greater, path_greater)) |
|
1482 |
self.assertEqual(-1, osutils.compare_paths_prefix_order( |
|
1483 |
path_less, path_greater)) |
|
1484 |
self.assertEqual(1, osutils.compare_paths_prefix_order( |
|
1485 |
path_greater, path_less)) |
|
1486 |
||
1487 |
def test_compare_paths_prefix_order(self): |
|
1488 |
# root before all else
|
|
1489 |
self.assertPathCompare("/", "/a") |
|
1490 |
# alpha within a dir
|
|
1491 |
self.assertPathCompare("/a", "/b") |
|
1492 |
self.assertPathCompare("/b", "/z") |
|
1493 |
# high dirs before lower.
|
|
1494 |
self.assertPathCompare("/z", "/a/a") |
|
1773.3.2
by Robert Collins
New corner case from John Meinel, showing up the need to check the directory lexographically outside of a single tree's root. Fixed. |
1495 |
# except if the deeper dir should be output first
|
1496 |
self.assertPathCompare("/a/b/c", "/d/g") |
|
1773.3.1
by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions. |
1497 |
# lexical betwen dirs of the same height
|
1498 |
self.assertPathCompare("/a/z", "/z/z") |
|
1499 |
self.assertPathCompare("/a/c/z", "/a/d/e") |
|
1500 |
||
1501 |
# this should also be consistent for no leading / paths
|
|
1502 |
# root before all else
|
|
1503 |
self.assertPathCompare("", "a") |
|
1504 |
# alpha within a dir
|
|
1505 |
self.assertPathCompare("a", "b") |
|
1506 |
self.assertPathCompare("b", "z") |
|
1507 |
# high dirs before lower.
|
|
1508 |
self.assertPathCompare("z", "a/a") |
|
1773.3.2
by Robert Collins
New corner case from John Meinel, showing up the need to check the directory lexographically outside of a single tree's root. Fixed. |
1509 |
# except if the deeper dir should be output first
|
1510 |
self.assertPathCompare("a/b/c", "d/g") |
|
1773.3.1
by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions. |
1511 |
# lexical betwen dirs of the same height
|
1512 |
self.assertPathCompare("a/z", "z/z") |
|
1513 |
self.assertPathCompare("a/c/z", "a/d/e") |
|
1514 |
||
1773.3.3
by Robert Collins
Add new tests John Meinel asked for. |
1515 |
def test_path_prefix_sorting(self): |
1516 |
"""Doing a sort on path prefix should match our sample data."""
|
|
1517 |
original_paths = [ |
|
1518 |
'a', |
|
1519 |
'a/b', |
|
1520 |
'a/b/c', |
|
1521 |
'b', |
|
1522 |
'b/c', |
|
1523 |
'd', |
|
1524 |
'd/e', |
|
1525 |
'd/e/f', |
|
1526 |
'd/f', |
|
1527 |
'd/g', |
|
1528 |
'g', |
|
1529 |
]
|
|
1530 |
||
1531 |
dir_sorted_paths = [ |
|
1532 |
'a', |
|
1533 |
'b', |
|
1534 |
'd', |
|
1535 |
'g', |
|
1536 |
'a/b', |
|
1537 |
'a/b/c', |
|
1538 |
'b/c', |
|
1539 |
'd/e', |
|
1540 |
'd/f', |
|
1541 |
'd/g', |
|
1542 |
'd/e/f', |
|
1543 |
]
|
|
1544 |
||
1545 |
self.assertEqual( |
|
1546 |
dir_sorted_paths, |
|
1547 |
sorted(original_paths, key=osutils.path_prefix_key)) |
|
1548 |
# using the comparison routine shoudl work too:
|
|
1549 |
self.assertEqual( |
|
1550 |
dir_sorted_paths, |
|
1551 |
sorted(original_paths, cmp=osutils.compare_paths_prefix_order)) |
|
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
1552 |
|
1553 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1554 |
class TestCopyTree(tests.TestCaseInTempDir): |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1555 |
|
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1556 |
def test_copy_basic_tree(self): |
1557 |
self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c']) |
|
1558 |
osutils.copy_tree('source', 'target') |
|
2095.3.1
by Martin Pool
Tests shouldn't assume os.listdir returns sorted results |
1559 |
self.assertEqual(['a', 'b'], sorted(os.listdir('target'))) |
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1560 |
self.assertEqual(['c'], os.listdir('target/b')) |
1561 |
||
1562 |
def test_copy_tree_target_exists(self): |
|
1563 |
self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c', |
|
1564 |
'target/']) |
|
1565 |
osutils.copy_tree('source', 'target') |
|
2095.3.1
by Martin Pool
Tests shouldn't assume os.listdir returns sorted results |
1566 |
self.assertEqual(['a', 'b'], sorted(os.listdir('target'))) |
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1567 |
self.assertEqual(['c'], os.listdir('target/b')) |
1568 |
||
1907.3.2
by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality. |
1569 |
def test_copy_tree_symlinks(self): |
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1570 |
self.requireFeature(tests.SymlinkFeature) |
1907.3.2
by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality. |
1571 |
self.build_tree(['source/']) |
1572 |
os.symlink('a/generic/path', 'source/lnk') |
|
1573 |
osutils.copy_tree('source', 'target') |
|
1574 |
self.assertEqual(['lnk'], os.listdir('target')) |
|
1575 |
self.assertEqual('a/generic/path', os.readlink('target/lnk')) |
|
1576 |
||
1577 |
def test_copy_tree_handlers(self): |
|
1578 |
processed_files = [] |
|
1579 |
processed_links = [] |
|
1580 |
def file_handler(from_path, to_path): |
|
1581 |
processed_files.append(('f', from_path, to_path)) |
|
1582 |
def dir_handler(from_path, to_path): |
|
1583 |
processed_files.append(('d', from_path, to_path)) |
|
1584 |
def link_handler(from_path, to_path): |
|
1585 |
processed_links.append((from_path, to_path)) |
|
1586 |
handlers = {'file':file_handler, |
|
1587 |
'directory':dir_handler, |
|
1588 |
'symlink':link_handler, |
|
1589 |
}
|
|
1590 |
||
1591 |
self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c']) |
|
1592 |
if osutils.has_symlinks(): |
|
1593 |
os.symlink('a/generic/path', 'source/lnk') |
|
1594 |
osutils.copy_tree('source', 'target', handlers=handlers) |
|
1595 |
||
1596 |
self.assertEqual([('d', 'source', 'target'), |
|
1597 |
('f', 'source/a', 'target/a'), |
|
1598 |
('d', 'source/b', 'target/b'), |
|
1599 |
('f', 'source/b/c', 'target/b/c'), |
|
1600 |
], processed_files) |
|
1601 |
self.failIfExists('target') |
|
1602 |
if osutils.has_symlinks(): |
|
1603 |
self.assertEqual([('source/lnk', 'target/lnk')], processed_links) |
|
1604 |
||
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1605 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1606 |
class TestSetUnsetEnv(tests.TestCase): |
1963.1.5
by John Arbash Meinel
Create an osutils helper function for modifying the environment |
1607 |
"""Test updating the environment"""
|
1608 |
||
1609 |
def setUp(self): |
|
1610 |
super(TestSetUnsetEnv, self).setUp() |
|
1611 |
||
1612 |
self.assertEqual(None, os.environ.get('BZR_TEST_ENV_VAR'), |
|
1613 |
'Environment was not cleaned up properly.'
|
|
1614 |
' Variable BZR_TEST_ENV_VAR should not exist.') |
|
1615 |
def cleanup(): |
|
1616 |
if 'BZR_TEST_ENV_VAR' in os.environ: |
|
1617 |
del os.environ['BZR_TEST_ENV_VAR'] |
|
1618 |
self.addCleanup(cleanup) |
|
1619 |
||
1620 |
def test_set(self): |
|
1621 |
"""Test that we can set an env variable"""
|
|
1622 |
old = osutils.set_or_unset_env('BZR_TEST_ENV_VAR', 'foo') |
|
1623 |
self.assertEqual(None, old) |
|
1624 |
self.assertEqual('foo', os.environ.get('BZR_TEST_ENV_VAR')) |
|
1625 |
||
1626 |
def test_double_set(self): |
|
1627 |
"""Test that we get the old value out"""
|
|
1628 |
osutils.set_or_unset_env('BZR_TEST_ENV_VAR', 'foo') |
|
1629 |
old = osutils.set_or_unset_env('BZR_TEST_ENV_VAR', 'bar') |
|
1630 |
self.assertEqual('foo', old) |
|
1631 |
self.assertEqual('bar', os.environ.get('BZR_TEST_ENV_VAR')) |
|
1632 |
||
1633 |
def test_unicode(self): |
|
1634 |
"""Environment can only contain plain strings
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1635 |
|
1963.1.5
by John Arbash Meinel
Create an osutils helper function for modifying the environment |
1636 |
So Unicode strings must be encoded.
|
1637 |
"""
|
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1638 |
uni_val, env_val = tests.probe_unicode_in_user_encoding() |
2785.1.5
by Alexander Belchenko
support for non-ascii BZR_HOME in show_version() |
1639 |
if uni_val is None: |
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1640 |
raise tests.TestSkipped( |
1641 |
'Cannot find a unicode character that works in encoding %s' |
|
1642 |
% (osutils.get_user_encoding(),)) |
|
1963.1.5
by John Arbash Meinel
Create an osutils helper function for modifying the environment |
1643 |
|
1644 |
old = osutils.set_or_unset_env('BZR_TEST_ENV_VAR', uni_val) |
|
1645 |
self.assertEqual(env_val, os.environ.get('BZR_TEST_ENV_VAR')) |
|
1646 |
||
1647 |
def test_unset(self): |
|
1648 |
"""Test that passing None will remove the env var"""
|
|
1649 |
osutils.set_or_unset_env('BZR_TEST_ENV_VAR', 'foo') |
|
1650 |
old = osutils.set_or_unset_env('BZR_TEST_ENV_VAR', None) |
|
1651 |
self.assertEqual('foo', old) |
|
1652 |
self.assertEqual(None, os.environ.get('BZR_TEST_ENV_VAR')) |
|
1653 |
self.failIf('BZR_TEST_ENV_VAR' in os.environ) |
|
1654 |
||
2215.6.2
by James Henstridge
add some simple tests for local_time_offset() |
1655 |
|
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1656 |
class TestSizeShaFile(tests.TestCaseInTempDir): |
3368.2.49
by Ian Clatworthy
added osutils.size_sha_file() with tests |
1657 |
|
1658 |
def test_sha_empty(self): |
|
1659 |
self.build_tree_contents([('foo', '')]) |
|
1660 |
expected_sha = osutils.sha_string('') |
|
1661 |
f = open('foo') |
|
1662 |
self.addCleanup(f.close) |
|
1663 |
size, sha = osutils.size_sha_file(f) |
|
1664 |
self.assertEqual(0, size) |
|
1665 |
self.assertEqual(expected_sha, sha) |
|
1666 |
||
1667 |
def test_sha_mixed_endings(self): |
|
1668 |
text = 'test\r\nwith\nall\rpossible line endings\r\n' |
|
1669 |
self.build_tree_contents([('foo', text)]) |
|
1670 |
expected_sha = osutils.sha_string(text) |
|
4789.25.1
by John Arbash Meinel
When computing the sha1sum for a file, make sure it is opened in binary mode. |
1671 |
f = open('foo', 'rb') |
3368.2.49
by Ian Clatworthy
added osutils.size_sha_file() with tests |
1672 |
self.addCleanup(f.close) |
1673 |
size, sha = osutils.size_sha_file(f) |
|
1674 |
self.assertEqual(38, size) |
|
1675 |
self.assertEqual(expected_sha, sha) |
|
1676 |
||
1677 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1678 |
class TestShaFileByName(tests.TestCaseInTempDir): |
2922.1.2
by John Arbash Meinel
Add tests for sha_file_by_name. |
1679 |
|
1680 |
def test_sha_empty(self): |
|
1681 |
self.build_tree_contents([('foo', '')]) |
|
1682 |
expected_sha = osutils.sha_string('') |
|
1683 |
self.assertEqual(expected_sha, osutils.sha_file_by_name('foo')) |
|
1684 |
||
1685 |
def test_sha_mixed_endings(self): |
|
1686 |
text = 'test\r\nwith\nall\rpossible line endings\r\n' |
|
1687 |
self.build_tree_contents([('foo', text)]) |
|
1688 |
expected_sha = osutils.sha_string(text) |
|
1689 |
self.assertEqual(expected_sha, osutils.sha_file_by_name('foo')) |
|
3089.3.9
by Ian Clatworthy
add test for resource loading |
1690 |
|
1691 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1692 |
class TestResourceLoading(tests.TestCaseInTempDir): |
3089.3.9
by Ian Clatworthy
add test for resource loading |
1693 |
|
1694 |
def test_resource_string(self): |
|
1695 |
# test resource in bzrlib
|
|
1696 |
text = osutils.resource_string('bzrlib', 'debug.py') |
|
3959.1.4
by Martin Pool
test_resource_string shouldn't depend on the precise source file contents |
1697 |
self.assertContainsRe(text, "debug_flags = set()") |
3089.3.9
by Ian Clatworthy
add test for resource loading |
1698 |
# test resource under bzrlib
|
1699 |
text = osutils.resource_string('bzrlib.ui', 'text.py') |
|
1700 |
self.assertContainsRe(text, "class TextUIFactory") |
|
1701 |
# test unsupported package
|
|
1702 |
self.assertRaises(errors.BzrError, osutils.resource_string, 'zzzz', |
|
1703 |
'yyy.xx') |
|
1704 |
# test unknown resource
|
|
1705 |
self.assertRaises(IOError, osutils.resource_string, 'bzrlib', 'yyy.xx') |
|
4183.6.4
by Martin Pool
Separate out re_compile_checked |
1706 |
|
1707 |
||
4241.14.3
by Vincent Ladeuil
Cleanup imports. |
1708 |
class TestReCompile(tests.TestCase): |
4183.6.4
by Martin Pool
Separate out re_compile_checked |
1709 |
|
5326.2.10
by Parth Malwankar
updated re_compile_checked tests to handle deprecation. |
1710 |
def _deprecated_re_compile_checked(self, *args, **kwargs): |
1711 |
return self.applyDeprecated(symbol_versioning.deprecated_in((2, 2, 0)), |
|
1712 |
osutils.re_compile_checked, *args, **kwargs) |
|
1713 |
||
4183.6.4
by Martin Pool
Separate out re_compile_checked |
1714 |
def test_re_compile_checked(self): |
5326.2.10
by Parth Malwankar
updated re_compile_checked tests to handle deprecation. |
1715 |
r = self._deprecated_re_compile_checked(r'A*', re.IGNORECASE) |
4183.6.4
by Martin Pool
Separate out re_compile_checked |
1716 |
self.assertTrue(r.match('aaaa')) |
1717 |
self.assertTrue(r.match('aAaA')) |
|
1718 |
||
1719 |
def test_re_compile_checked_error(self): |
|
1720 |
# like https://bugs.launchpad.net/bzr/+bug/251352
|
|
5326.2.11
by Parth Malwankar
re-install lazy re compile for failing test. |
1721 |
|
1722 |
# Due to possible test isolation error, re.compile is not lazy at
|
|
1723 |
# this point. We re-install lazy compile.
|
|
1724 |
lazy_regex.install_lazy_compile() |
|
4183.6.4
by Martin Pool
Separate out re_compile_checked |
1725 |
err = self.assertRaises( |
1726 |
errors.BzrCommandError, |
|
5326.2.10
by Parth Malwankar
updated re_compile_checked tests to handle deprecation. |
1727 |
self._deprecated_re_compile_checked, '*', re.IGNORECASE, 'test case') |
4183.6.4
by Martin Pool
Separate out re_compile_checked |
1728 |
self.assertEqual( |
5326.2.6
by Parth Malwankar
deprecate re_compile_checked rather than remove it. |
1729 |
'Invalid regular expression in test case: '
|
1730 |
'"*" nothing to repeat', |
|
4183.6.4
by Martin Pool
Separate out re_compile_checked |
1731 |
str(err)) |
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
1732 |
|
1733 |
||
1734 |
class TestDirReader(tests.TestCaseInTempDir): |
|
1735 |
||
1736 |
# Set by load_tests
|
|
1737 |
_dir_reader_class = None |
|
1738 |
_native_to_unicode = None |
|
1739 |
||
1740 |
def setUp(self): |
|
1741 |
tests.TestCaseInTempDir.setUp(self) |
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1742 |
self.overrideAttr(osutils, |
1743 |
'_selected_dir_reader', self._dir_reader_class()) |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
1744 |
|
1745 |
def _get_ascii_tree(self): |
|
1746 |
tree = [ |
|
1747 |
'0file', |
|
1748 |
'1dir/', |
|
1749 |
'1dir/0file', |
|
1750 |
'1dir/1dir/', |
|
1751 |
'2file'
|
|
1752 |
]
|
|
1753 |
expected_dirblocks = [ |
|
1754 |
(('', '.'), |
|
1755 |
[('0file', '0file', 'file'), |
|
1756 |
('1dir', '1dir', 'directory'), |
|
1757 |
('2file', '2file', 'file'), |
|
1758 |
]
|
|
1759 |
),
|
|
1760 |
(('1dir', './1dir'), |
|
1761 |
[('1dir/0file', '0file', 'file'), |
|
1762 |
('1dir/1dir', '1dir', 'directory'), |
|
1763 |
]
|
|
1764 |
),
|
|
1765 |
(('1dir/1dir', './1dir/1dir'), |
|
1766 |
[
|
|
1767 |
]
|
|
1768 |
),
|
|
1769 |
]
|
|
1770 |
return tree, expected_dirblocks |
|
1771 |
||
1772 |
def test_walk_cur_dir(self): |
|
1773 |
tree, expected_dirblocks = self._get_ascii_tree() |
|
1774 |
self.build_tree(tree) |
|
1775 |
result = list(osutils._walkdirs_utf8('.')) |
|
1776 |
# Filter out stat and abspath
|
|
1777 |
self.assertEqual(expected_dirblocks, |
|
1778 |
[(dirinfo, [line[0:3] for line in block]) |
|
1779 |
for dirinfo, block in result]) |
|
1780 |
||
1781 |
def test_walk_sub_dir(self): |
|
1782 |
tree, expected_dirblocks = self._get_ascii_tree() |
|
1783 |
self.build_tree(tree) |
|
1784 |
# you can search a subdir only, with a supplied prefix.
|
|
1785 |
result = list(osutils._walkdirs_utf8('./1dir', '1dir')) |
|
1786 |
# Filter out stat and abspath
|
|
1787 |
self.assertEqual(expected_dirblocks[1:], |
|
1788 |
[(dirinfo, [line[0:3] for line in block]) |
|
1789 |
for dirinfo, block in result]) |
|
1790 |
||
1791 |
def _get_unicode_tree(self): |
|
1792 |
name0u = u'0file-\xb6' |
|
1793 |
name1u = u'1dir-\u062c\u0648' |
|
1794 |
name2u = u'2file-\u0633' |
|
1795 |
tree = [ |
|
1796 |
name0u, |
|
1797 |
name1u + '/', |
|
1798 |
name1u + '/' + name0u, |
|
1799 |
name1u + '/' + name1u + '/', |
|
1800 |
name2u, |
|
1801 |
]
|
|
1802 |
name0 = name0u.encode('UTF-8') |
|
1803 |
name1 = name1u.encode('UTF-8') |
|
1804 |
name2 = name2u.encode('UTF-8') |
|
1805 |
expected_dirblocks = [ |
|
1806 |
(('', '.'), |
|
1807 |
[(name0, name0, 'file', './' + name0u), |
|
1808 |
(name1, name1, 'directory', './' + name1u), |
|
1809 |
(name2, name2, 'file', './' + name2u), |
|
1810 |
]
|
|
1811 |
),
|
|
1812 |
((name1, './' + name1u), |
|
1813 |
[(name1 + '/' + name0, name0, 'file', './' + name1u |
|
1814 |
+ '/' + name0u), |
|
1815 |
(name1 + '/' + name1, name1, 'directory', './' + name1u |
|
1816 |
+ '/' + name1u), |
|
1817 |
]
|
|
1818 |
),
|
|
1819 |
((name1 + '/' + name1, './' + name1u + '/' + name1u), |
|
1820 |
[
|
|
1821 |
]
|
|
1822 |
),
|
|
1823 |
]
|
|
1824 |
return tree, expected_dirblocks |
|
1825 |
||
4241.14.7
by Vincent Ladeuil
Add a test for symlinks name handling. |
1826 |
def _filter_out(self, raw_dirblocks): |
1827 |
"""Filter out a walkdirs_utf8 result.
|
|
1828 |
||
1829 |
stat field is removed, all native paths are converted to unicode
|
|
1830 |
"""
|
|
1831 |
filtered_dirblocks = [] |
|
1832 |
for dirinfo, block in raw_dirblocks: |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
1833 |
dirinfo = (dirinfo[0], self._native_to_unicode(dirinfo[1])) |
1834 |
details = [] |
|
1835 |
for line in block: |
|
4789.25.5
by John Arbash Meinel
Remove a pdb.set_trace() call. |
1836 |
details.append(line[0:3] + (self._native_to_unicode(line[4]), )) |
4241.14.7
by Vincent Ladeuil
Add a test for symlinks name handling. |
1837 |
filtered_dirblocks.append((dirinfo, details)) |
1838 |
return filtered_dirblocks |
|
1839 |
||
1840 |
def test_walk_unicode_tree(self): |
|
4241.14.25
by Vincent Ladeuil
Fix PQM failures. |
1841 |
self.requireFeature(tests.UnicodeFilenameFeature) |
4241.14.7
by Vincent Ladeuil
Add a test for symlinks name handling. |
1842 |
tree, expected_dirblocks = self._get_unicode_tree() |
1843 |
self.build_tree(tree) |
|
1844 |
result = list(osutils._walkdirs_utf8('.')) |
|
1845 |
self.assertEqual(expected_dirblocks, self._filter_out(result)) |
|
1846 |
||
1847 |
def test_symlink(self): |
|
1848 |
self.requireFeature(tests.SymlinkFeature) |
|
4241.14.25
by Vincent Ladeuil
Fix PQM failures. |
1849 |
self.requireFeature(tests.UnicodeFilenameFeature) |
4241.14.14
by Vincent Ladeuil
Test and implements osutils.readlink(). |
1850 |
target = u'target\N{Euro Sign}' |
1851 |
link_name = u'l\N{Euro Sign}nk' |
|
4241.14.7
by Vincent Ladeuil
Add a test for symlinks name handling. |
1852 |
os.symlink(target, link_name) |
1853 |
target_utf8 = target.encode('UTF-8') |
|
1854 |
link_name_utf8 = link_name.encode('UTF-8') |
|
1855 |
expected_dirblocks = [ |
|
1856 |
(('', '.'), |
|
1857 |
[(link_name_utf8, link_name_utf8, |
|
1858 |
'symlink', './' + link_name),], |
|
1859 |
)]
|
|
1860 |
result = list(osutils._walkdirs_utf8('.')) |
|
1861 |
self.assertEqual(expected_dirblocks, self._filter_out(result)) |
|
4241.14.14
by Vincent Ladeuil
Test and implements osutils.readlink(). |
1862 |
|
1863 |
||
1864 |
class TestReadLink(tests.TestCaseInTempDir): |
|
1865 |
"""Exposes os.readlink() problems and the osutils solution.
|
|
1866 |
||
1867 |
The only guarantee offered by os.readlink(), starting with 2.6, is that a
|
|
1868 |
unicode string will be returned if a unicode string is passed.
|
|
1869 |
||
4241.14.25
by Vincent Ladeuil
Fix PQM failures. |
1870 |
But prior python versions failed to properly encode the passed unicode
|
4241.14.14
by Vincent Ladeuil
Test and implements osutils.readlink(). |
1871 |
string.
|
1872 |
"""
|
|
4331.1.3
by Vincent Ladeuil
Revert previous patch, PQM now presents a unicode friendly file system encoding. |
1873 |
_test_needs_features = [tests.SymlinkFeature, tests.UnicodeFilenameFeature] |
4241.14.14
by Vincent Ladeuil
Test and implements osutils.readlink(). |
1874 |
|
1875 |
def setUp(self): |
|
1876 |
super(tests.TestCaseInTempDir, self).setUp() |
|
1877 |
self.link = u'l\N{Euro Sign}ink' |
|
1878 |
self.target = u'targe\N{Euro Sign}t' |
|
1879 |
os.symlink(self.target, self.link) |
|
1880 |
||
1881 |
def test_os_readlink_link_encoding(self): |
|
1882 |
if sys.version_info < (2, 6): |
|
1883 |
self.assertRaises(UnicodeEncodeError, os.readlink, self.link) |
|
1884 |
else: |
|
1885 |
self.assertEquals(self.target, os.readlink(self.link)) |
|
1886 |
||
1887 |
def test_os_readlink_link_decoding(self): |
|
1888 |
self.assertEquals(self.target.encode(osutils._fs_enc), |
|
1889 |
os.readlink(self.link.encode(osutils._fs_enc))) |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
1890 |
|
1891 |
||
1892 |
class TestConcurrency(tests.TestCase): |
|
1893 |
||
4766.3.4
by Matt Nordhoff
Change the environment variable to a global option. |
1894 |
def setUp(self): |
1895 |
super(TestConcurrency, self).setUp() |
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1896 |
self.overrideAttr(osutils, '_cached_local_concurrency') |
4766.3.4
by Matt Nordhoff
Change the environment variable to a global option. |
1897 |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
1898 |
def test_local_concurrency(self): |
1899 |
concurrency = osutils.local_concurrency() |
|
1900 |
self.assertIsInstance(concurrency, int) |
|
4574.3.3
by Martin Pool
Add test for failure to load extensions |
1901 |
|
4766.3.7
by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available. |
1902 |
def test_local_concurrency_environment_variable(self): |
1903 |
os.environ['BZR_CONCURRENCY'] = '2' |
|
1904 |
self.assertEqual(2, osutils.local_concurrency(use_cache=False)) |
|
1905 |
os.environ['BZR_CONCURRENCY'] = '3' |
|
1906 |
self.assertEqual(3, osutils.local_concurrency(use_cache=False)) |
|
1907 |
os.environ['BZR_CONCURRENCY'] = 'foo' |
|
1908 |
self.assertEqual(1, osutils.local_concurrency(use_cache=False)) |
|
1909 |
||
1910 |
def test_option_concurrency(self): |
|
1911 |
os.environ['BZR_CONCURRENCY'] = '1' |
|
1912 |
self.run_bzr('rocks --concurrency 42') |
|
1913 |
# Command line overrides envrionment variable
|
|
1914 |
self.assertEquals('42', os.environ['BZR_CONCURRENCY']) |
|
1915 |
self.assertEquals(42, osutils.local_concurrency(use_cache=False)) |
|
4766.3.1
by Matt Nordhoff
Add a BZR_CONCURRENCY environment variable, so users can control osutils.local_concurrency() |
1916 |
|
4574.3.3
by Martin Pool
Add test for failure to load extensions |
1917 |
|
1918 |
class TestFailedToLoadExtension(tests.TestCase): |
|
1919 |
||
1920 |
def _try_loading(self): |
|
1921 |
try: |
|
1922 |
import bzrlib._fictional_extension_py |
|
1923 |
except ImportError, e: |
|
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1924 |
osutils.failed_to_load_extension(e) |
4574.3.3
by Martin Pool
Add test for failure to load extensions |
1925 |
return True |
1926 |
||
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1927 |
def setUp(self): |
1928 |
super(TestFailedToLoadExtension, self).setUp() |
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1929 |
self.overrideAttr(osutils, '_extension_load_failures', []) |
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1930 |
|
4574.3.3
by Martin Pool
Add test for failure to load extensions |
1931 |
def test_failure_to_load(self): |
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1932 |
self._try_loading() |
1933 |
self.assertLength(1, osutils._extension_load_failures) |
|
1934 |
self.assertEquals(osutils._extension_load_failures[0], |
|
1935 |
"No module named _fictional_extension_py") |
|
1936 |
||
4695.4.1
by Martin Pool
Give a shorter/cleaner message for missing extensions |
1937 |
def test_report_extension_load_failures_no_warning(self): |
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1938 |
self.assertTrue(self._try_loading()) |
1939 |
warnings, result = self.callCatchWarnings(osutils.report_extension_load_failures) |
|
4695.4.1
by Martin Pool
Give a shorter/cleaner message for missing extensions |
1940 |
# it used to give a Python warning; it no longer does
|
1941 |
self.assertLength(0, warnings) |
|
1942 |
||
1943 |
def test_report_extension_load_failures_message(self): |
|
1944 |
log = StringIO() |
|
1945 |
trace.push_log_file(log) |
|
1946 |
self.assertTrue(self._try_loading()) |
|
1947 |
osutils.report_extension_load_failures() |
|
1948 |
self.assertContainsRe( |
|
1949 |
log.getvalue(), |
|
1950 |
r"bzr: warning: some compiled extensions could not be loaded; " |
|
1951 |
"see <https://answers\.launchpad\.net/bzr/\+faq/703>\n" |
|
1952 |
)
|
|
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
1953 |
|
1954 |
||
1955 |
class TestTerminalWidth(tests.TestCase): |
|
1956 |
||
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1957 |
def setUp(self): |
1958 |
tests.TestCase.setUp(self) |
|
1959 |
self._orig_terminal_size_state = osutils._terminal_size_state |
|
1960 |
self._orig_first_terminal_size = osutils._first_terminal_size |
|
1961 |
self.addCleanup(self.restore_osutils_globals) |
|
1962 |
osutils._terminal_size_state = 'no_data' |
|
1963 |
osutils._first_terminal_size = None |
|
1964 |
||
1965 |
def restore_osutils_globals(self): |
|
1966 |
osutils._terminal_size_state = self._orig_terminal_size_state |
|
1967 |
osutils._first_terminal_size = self._orig_first_terminal_size |
|
5279.2.9
by Eric Moritz
Deleted trailing whitespace |
1968 |
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1969 |
def replace_stdout(self, new): |
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1970 |
self.overrideAttr(sys, 'stdout', new) |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1971 |
|
1972 |
def replace__terminal_size(self, new): |
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1973 |
self.overrideAttr(osutils, '_terminal_size', new) |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1974 |
|
4747.4.7
by Vincent Ladeuil
Fix broken test (fail on windows). |
1975 |
def set_fake_tty(self): |
1976 |
||
1977 |
class I_am_a_tty(object): |
|
1978 |
def isatty(self): |
|
1979 |
return True |
|
1980 |
||
1981 |
self.replace_stdout(I_am_a_tty()) |
|
1982 |
||
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
1983 |
def test_default_values(self): |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1984 |
self.assertEqual(80, osutils.default_terminal_width) |
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
1985 |
|
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
1986 |
def test_defaults_to_BZR_COLUMNS(self): |
1987 |
# BZR_COLUMNS is set by the test framework
|
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1988 |
self.assertNotEqual('12', os.environ['BZR_COLUMNS']) |
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
1989 |
os.environ['BZR_COLUMNS'] = '12' |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1990 |
self.assertEqual(12, osutils.terminal_width()) |
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
1991 |
|
4747.4.3
by Vincent Ladeuil
Re-fix the priority order since there is a known valid case. |
1992 |
def test_falls_back_to_COLUMNS(self): |
1993 |
del os.environ['BZR_COLUMNS'] |
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1994 |
self.assertNotEqual('42', os.environ['COLUMNS']) |
4747.4.7
by Vincent Ladeuil
Fix broken test (fail on windows). |
1995 |
self.set_fake_tty() |
4747.4.3
by Vincent Ladeuil
Re-fix the priority order since there is a known valid case. |
1996 |
os.environ['COLUMNS'] = '42' |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1997 |
self.assertEqual(42, osutils.terminal_width()) |
4747.4.3
by Vincent Ladeuil
Re-fix the priority order since there is a known valid case. |
1998 |
|
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
1999 |
def test_tty_default_without_columns(self): |
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
2000 |
del os.environ['BZR_COLUMNS'] |
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
2001 |
del os.environ['COLUMNS'] |
4747.3.5
by Vincent Ladeuil
More precise test. |
2002 |
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
2003 |
def terminal_size(w, h): |
2004 |
return 42, 42 |
|
2005 |
||
4747.4.7
by Vincent Ladeuil
Fix broken test (fail on windows). |
2006 |
self.set_fake_tty() |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
2007 |
# We need to override the osutils definition as it depends on the
|
2008 |
# running environment that we can't control (PQM running without a
|
|
2009 |
# controlling terminal is one example).
|
|
2010 |
self.replace__terminal_size(terminal_size) |
|
2011 |
self.assertEqual(42, osutils.terminal_width()) |
|
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
2012 |
|
2013 |
def test_non_tty_default_without_columns(self): |
|
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
2014 |
del os.environ['BZR_COLUMNS'] |
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
2015 |
del os.environ['COLUMNS'] |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
2016 |
self.replace_stdout(None) |
2017 |
self.assertEqual(None, osutils.terminal_width()) |
|
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
2018 |
|
4873.2.2
by John Arbash Meinel
Change the TIOCGWINSZ test to use a _ModuleFeature. (fixes bug #492561) |
2019 |
def test_no_TIOCGWINSZ(self): |
4913.2.20
by John Arbash Meinel
Change all of the compiled_foo to compiled_foo_feature |
2020 |
self.requireFeature(term_ios_feature) |
2021 |
termios = term_ios_feature.module |
|
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
2022 |
# bug 63539 is about a termios without TIOCGWINSZ attribute
|
2023 |
try: |
|
2024 |
orig = termios.TIOCGWINSZ |
|
2025 |
except AttributeError: |
|
4873.2.2
by John Arbash Meinel
Change the TIOCGWINSZ test to use a _ModuleFeature. (fixes bug #492561) |
2026 |
# We won't remove TIOCGWINSZ, because it doesn't exist anyway :)
|
2027 |
pass
|
|
2028 |
else: |
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
2029 |
self.overrideAttr(termios, 'TIOCGWINSZ') |
4873.2.2
by John Arbash Meinel
Change the TIOCGWINSZ test to use a _ModuleFeature. (fixes bug #492561) |
2030 |
del termios.TIOCGWINSZ |
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
2031 |
del os.environ['BZR_COLUMNS'] |
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
2032 |
del os.environ['COLUMNS'] |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
2033 |
# Whatever the result is, if we don't raise an exception, it's ok.
|
2034 |
osutils.terminal_width() |
|
5051.4.3
by Parth Malwankar
added tests for osutils.{parent_dir, mkdir, open} |
2035 |
|
2036 |
class TestCreationOps(tests.TestCaseInTempDir): |
|
5051.4.11
by Parth Malwankar
closed Martins review comments. |
2037 |
_test_needs_features = [features.chown_feature] |
5051.4.3
by Parth Malwankar
added tests for osutils.{parent_dir, mkdir, open} |
2038 |
|
2039 |
def setUp(self): |
|
2040 |
tests.TestCaseInTempDir.setUp(self) |
|
5051.4.9
by Parth Malwankar
removed parent_dir. |
2041 |
self.overrideAttr(os, 'chown', self._dummy_chown) |
5051.4.3
by Parth Malwankar
added tests for osutils.{parent_dir, mkdir, open} |
2042 |
|
2043 |
# params set by call to _dummy_chown
|
|
2044 |
self.path = self.uid = self.gid = None |
|
2045 |
||
2046 |
def _dummy_chown(self, path, uid, gid): |
|
2047 |
self.path, self.uid, self.gid = path, uid, gid |
|
2048 |
||
5116.2.6
by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path. |
2049 |
def test_copy_ownership_from_path(self): |
5116.2.11
by Vincent Ladeuil
Fix typos. |
2050 |
"""copy_ownership_from_path test with specified src."""
|
5116.2.3
by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz] |
2051 |
ownsrc = '/' |
2052 |
f = open('test_file', 'wt') |
|
5116.2.11
by Vincent Ladeuil
Fix typos. |
2053 |
osutils.copy_ownership_from_path('test_file', ownsrc) |
5116.2.3
by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz] |
2054 |
|
2055 |
s = os.stat(ownsrc) |
|
2056 |
self.assertEquals(self.path, 'test_file') |
|
2057 |
self.assertEquals(self.uid, s.st_uid) |
|
2058 |
self.assertEquals(self.gid, s.st_gid) |
|
2059 |
||
2060 |
def test_copy_ownership_nonesrc(self): |
|
5116.2.11
by Vincent Ladeuil
Fix typos. |
2061 |
"""copy_ownership_from_path test with src=None."""
|
5116.2.3
by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz] |
2062 |
f = open('test_file', 'wt') |
2063 |
# should use parent dir for permissions
|
|
5116.2.11
by Vincent Ladeuil
Fix typos. |
2064 |
osutils.copy_ownership_from_path('test_file') |
5116.2.3
by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz] |
2065 |
|
2066 |
s = os.stat('..') |
|
2067 |
self.assertEquals(self.path, 'test_file') |
|
2068 |
self.assertEquals(self.uid, s.st_uid) |
|
2069 |
self.assertEquals(self.gid, s.st_gid) |
|
5187.2.8
by Parth Malwankar
added tests for getuser_unicode |
2070 |
|
2071 |
class TestGetuserUnicode(tests.TestCase): |
|
2072 |
||
2073 |
def test_ascii_user(self): |
|
2074 |
osutils.set_or_unset_env('LOGNAME', 'jrandom') |
|
2075 |
self.assertEqual(u'jrandom', osutils.getuser_unicode()) |
|
2076 |
||
2077 |
def test_unicode_user(self): |
|
2078 |
ue = osutils.get_user_encoding() |
|
5050.37.1
by Andrew Bennetts
Some fixes for tests that did not cope with LANG=C. |
2079 |
uni_val, env_val = tests.probe_unicode_in_user_encoding() |
2080 |
if uni_val is None: |
|
2081 |
raise tests.TestSkipped( |
|
2082 |
'Cannot find a unicode character that works in encoding %s' |
|
2083 |
% (osutils.get_user_encoding(),)) |
|
2084 |
uni_username = u'jrandom' + uni_val |
|
2085 |
encoded_username = uni_username.encode(ue) |
|
2086 |
osutils.set_or_unset_env('LOGNAME', encoded_username) |
|
2087 |
self.assertEqual(uni_username, osutils.getuser_unicode()) |