4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2005-2010 Canonical Ltd
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
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
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
16 |
|
17 |
"""Tests for finding and reading the bzr config file[s]."""
|
|
18 |
# import system imports here
|
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
19 |
from cStringIO import StringIO |
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
20 |
import os |
21 |
import sys |
|
5345.5.4
by Vincent Ladeuil
Start implementing config files locking. |
22 |
import threading |
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
23 |
|
24 |
#import bzrlib specific imports here
|
|
1878.1.3
by John Arbash Meinel
some test cleanups |
25 |
from bzrlib import ( |
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
26 |
branch, |
27 |
bzrdir, |
|
1878.1.3
by John Arbash Meinel
some test cleanups |
28 |
config, |
4603.1.10
by Aaron Bentley
Provide change editor via config. |
29 |
diff, |
1878.1.3
by John Arbash Meinel
some test cleanups |
30 |
errors, |
31 |
osutils, |
|
2681.1.8
by Aaron Bentley
Add Thunderbird support to bzr send |
32 |
mail_client, |
2900.2.14
by Vincent Ladeuil
More tests. |
33 |
ui, |
1878.1.3
by John Arbash Meinel
some test cleanups |
34 |
urlutils, |
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
35 |
tests, |
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
36 |
trace, |
3242.1.2
by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication |
37 |
transport, |
1878.1.3
by John Arbash Meinel
some test cleanups |
38 |
)
|
5050.13.1
by Parth Malwankar
fixed .bazaar ownership regression |
39 |
from bzrlib.tests import features |
2991.2.4
by Vincent Ladeuil
Various fixes following local testing environment rebuild. |
40 |
from bzrlib.util.configobj import configobj |
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
41 |
|
42 |
||
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
43 |
def lockable_config_scenarios(): |
44 |
return [ |
|
45 |
('global', |
|
46 |
{'config_class': config.GlobalConfig, |
|
47 |
'config_args': [], |
|
48 |
'config_section': 'DEFAULT'}), |
|
49 |
('locations', |
|
50 |
{'config_class': config.LocationConfig, |
|
51 |
'config_args': ['.'], |
|
52 |
'config_section': '.'}),] |
|
53 |
||
54 |
||
55 |
def load_tests(standard_tests, module, loader): |
|
56 |
suite = loader.suiteClass() |
|
57 |
||
58 |
lc_tests, remaining_tests = tests.split_suite_by_condition( |
|
59 |
standard_tests, tests.condition_isinstance(( |
|
60 |
TestLockableConfig, |
|
61 |
)))
|
|
62 |
tests.multiply_tests(lc_tests, lockable_config_scenarios(), suite) |
|
63 |
suite.addTest(remaining_tests) |
|
64 |
return suite |
|
65 |
||
66 |
||
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
67 |
sample_long_alias="log -r-15..-1 --line" |
2120.6.2
by James Henstridge
remove get_matching_sections() norecurse tests, since that feature is handled in the config policy code now |
68 |
sample_config_text = u""" |
69 |
[DEFAULT]
|
|
70 |
email=Erik B\u00e5gfors <erik@bagfors.nu> |
|
71 |
editor=vim
|
|
4603.1.20
by Aaron Bentley
Use string.Template substitution with @ as delimiter. |
72 |
change_editor=vimdiff -of @new_path @old_path
|
2120.6.2
by James Henstridge
remove get_matching_sections() norecurse tests, since that feature is handled in the config policy code now |
73 |
gpg_signing_command=gnome-gpg
|
74 |
log_format=short
|
|
75 |
user_global_option=something
|
|
76 |
[ALIASES]
|
|
77 |
h=help
|
|
78 |
ll=""" + sample_long_alias + "\n" |
|
79 |
||
80 |
||
81 |
sample_always_signatures = """ |
|
82 |
[DEFAULT]
|
|
83 |
check_signatures=ignore
|
|
84 |
create_signatures=always
|
|
85 |
"""
|
|
86 |
||
87 |
sample_ignore_signatures = """ |
|
88 |
[DEFAULT]
|
|
89 |
check_signatures=require
|
|
90 |
create_signatures=never
|
|
91 |
"""
|
|
92 |
||
93 |
sample_maybe_signatures = """ |
|
94 |
[DEFAULT]
|
|
95 |
check_signatures=ignore
|
|
96 |
create_signatures=when-required
|
|
97 |
"""
|
|
98 |
||
99 |
sample_branches_text = """ |
|
100 |
[http://www.example.com]
|
|
101 |
# Top level policy
|
|
102 |
email=Robert Collins <robertc@example.org>
|
|
2120.6.3
by James Henstridge
add some more tests for getting policy options, and behaviour of get_user_option in the presence of config policies |
103 |
normal_option = normal
|
104 |
appendpath_option = append
|
|
2120.6.8
by James Henstridge
Change syntax for setting config option policies. Rather than |
105 |
appendpath_option:policy = appendpath
|
2120.6.3
by James Henstridge
add some more tests for getting policy options, and behaviour of get_user_option in the presence of config policies |
106 |
norecurse_option = norecurse
|
2120.6.8
by James Henstridge
Change syntax for setting config option policies. Rather than |
107 |
norecurse_option:policy = norecurse
|
2120.6.2
by James Henstridge
remove get_matching_sections() norecurse tests, since that feature is handled in the config policy code now |
108 |
[http://www.example.com/ignoreparent]
|
109 |
# different project: ignore parent dir config
|
|
110 |
ignore_parents=true
|
|
111 |
[http://www.example.com/norecurse]
|
|
112 |
# configuration items that only apply to this dir
|
|
113 |
recurse=false
|
|
2120.6.3
by James Henstridge
add some more tests for getting policy options, and behaviour of get_user_option in the presence of config policies |
114 |
normal_option = norecurse
|
115 |
[http://www.example.com/dir]
|
|
116 |
appendpath_option = normal
|
|
2120.6.2
by James Henstridge
remove get_matching_sections() norecurse tests, since that feature is handled in the config policy code now |
117 |
[/b/]
|
118 |
check_signatures=require
|
|
119 |
# test trailing / matching with no children
|
|
120 |
[/a/]
|
|
121 |
check_signatures=check-available
|
|
122 |
gpg_signing_command=false
|
|
123 |
user_local_option=local
|
|
124 |
# test trailing / matching
|
|
125 |
[/a/*]
|
|
126 |
#subdirs will match but not the parent
|
|
127 |
[/a/c]
|
|
128 |
check_signatures=ignore
|
|
129 |
post_commit=bzrlib.tests.test_config.post_commit
|
|
130 |
#testing explicit beats globs
|
|
131 |
"""
|
|
1553.6.3
by Erik Bågfors
tests for AliasesConfig |
132 |
|
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
133 |
|
1474
by Robert Collins
Merge from Aaron Bentley. |
134 |
class InstrumentedConfigObj(object): |
135 |
"""A config obj look-enough-alike to record calls made to it."""
|
|
136 |
||
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
137 |
def __contains__(self, thing): |
138 |
self._calls.append(('__contains__', thing)) |
|
139 |
return False |
|
140 |
||
141 |
def __getitem__(self, key): |
|
142 |
self._calls.append(('__getitem__', key)) |
|
143 |
return self |
|
144 |
||
1551.2.20
by Aaron Bentley
Treated config files as utf-8 |
145 |
def __init__(self, input, encoding=None): |
146 |
self._calls = [('__init__', input, encoding)] |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
147 |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
148 |
def __setitem__(self, key, value): |
149 |
self._calls.append(('__setitem__', key, value)) |
|
150 |
||
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
151 |
def __delitem__(self, key): |
152 |
self._calls.append(('__delitem__', key)) |
|
153 |
||
154 |
def keys(self): |
|
155 |
self._calls.append(('keys',)) |
|
156 |
return [] |
|
157 |
||
5345.1.8
by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts. |
158 |
def reload(self): |
159 |
self._calls.append(('reload',)) |
|
160 |
||
1551.2.49
by abentley
Made ConfigObj output binary-identical files on win32 and *nix |
161 |
def write(self, arg): |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
162 |
self._calls.append(('write',)) |
163 |
||
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
164 |
def as_bool(self, value): |
165 |
self._calls.append(('as_bool', value)) |
|
166 |
return False |
|
167 |
||
168 |
def get_value(self, section, name): |
|
169 |
self._calls.append(('get_value', section, name)) |
|
170 |
return None |
|
171 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
172 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
173 |
class FakeBranch(object): |
174 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
175 |
def __init__(self, base=None, user_id=None): |
176 |
if base is None: |
|
177 |
self.base = "http://example.com/branches/demo" |
|
178 |
else: |
|
179 |
self.base = base |
|
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
180 |
self._transport = self.control_files = \ |
181 |
FakeControlFilesAndTransport(user_id=user_id) |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
182 |
|
4226.1.7
by Robert Collins
Alter test_config.FakeBranch in accordance with the Branch change to have a _get_config. |
183 |
def _get_config(self): |
184 |
return config.TransportConfig(self._transport, 'branch.conf') |
|
185 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
186 |
def lock_write(self): |
187 |
pass
|
|
188 |
||
189 |
def unlock(self): |
|
190 |
pass
|
|
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
191 |
|
192 |
||
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
193 |
class FakeControlFilesAndTransport(object): |
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
194 |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
195 |
def __init__(self, user_id=None): |
196 |
self.files = {} |
|
3388.2.3
by Martin Pool
Fix up more uses of LockableFiles.get_utf8 in tests |
197 |
if user_id: |
198 |
self.files['email'] = user_id |
|
3242.1.2
by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication |
199 |
self._transport = self |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
200 |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
201 |
def get_utf8(self, filename): |
3388.2.3
by Martin Pool
Fix up more uses of LockableFiles.get_utf8 in tests |
202 |
# from LockableFiles
|
203 |
raise AssertionError("get_utf8 should no longer be used") |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
204 |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
205 |
def get(self, filename): |
3388.2.3
by Martin Pool
Fix up more uses of LockableFiles.get_utf8 in tests |
206 |
# from Transport
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
207 |
try: |
208 |
return StringIO(self.files[filename]) |
|
209 |
except KeyError: |
|
210 |
raise errors.NoSuchFile(filename) |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
211 |
|
3388.2.3
by Martin Pool
Fix up more uses of LockableFiles.get_utf8 in tests |
212 |
def get_bytes(self, filename): |
213 |
# from Transport
|
|
214 |
try: |
|
215 |
return self.files[filename] |
|
216 |
except KeyError: |
|
217 |
raise errors.NoSuchFile(filename) |
|
218 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
219 |
def put(self, filename, fileobj): |
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
220 |
self.files[filename] = fileobj.read() |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
221 |
|
3242.1.2
by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication |
222 |
def put_file(self, filename, fileobj): |
223 |
return self.put(filename, fileobj) |
|
224 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
225 |
|
226 |
class InstrumentedConfig(config.Config): |
|
227 |
"""An instrumented config that supplies stubs for template methods."""
|
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
228 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
229 |
def __init__(self): |
230 |
super(InstrumentedConfig, self).__init__() |
|
231 |
self._calls = [] |
|
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
232 |
self._signatures = config.CHECK_NEVER |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
233 |
|
234 |
def _get_user_id(self): |
|
235 |
self._calls.append('_get_user_id') |
|
236 |
return "Robert Collins <robert.collins@example.org>" |
|
237 |
||
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
238 |
def _get_signature_checking(self): |
239 |
self._calls.append('_get_signature_checking') |
|
240 |
return self._signatures |
|
241 |
||
4603.1.10
by Aaron Bentley
Provide change editor via config. |
242 |
def _get_change_editor(self): |
243 |
self._calls.append('_get_change_editor') |
|
4603.1.20
by Aaron Bentley
Use string.Template substitution with @ as delimiter. |
244 |
return 'vimdiff -fo @new_path @old_path' |
4603.1.10
by Aaron Bentley
Provide change editor via config. |
245 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
246 |
|
1556.2.2
by Aaron Bentley
Fixed get_bool |
247 |
bool_config = """[DEFAULT] |
248 |
active = true
|
|
249 |
inactive = false
|
|
250 |
[UPPERCASE]
|
|
251 |
active = True
|
|
252 |
nonactive = False
|
|
253 |
"""
|
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
254 |
|
255 |
||
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
256 |
class TestConfigObj(tests.TestCase): |
3221.7.4
by Matt Nordhoff
Add test for bug #86838. |
257 |
|
1556.2.2
by Aaron Bentley
Fixed get_bool |
258 |
def test_get_bool(self): |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
259 |
co = config.ConfigObj(StringIO(bool_config)) |
1556.2.2
by Aaron Bentley
Fixed get_bool |
260 |
self.assertIs(co.get_bool('DEFAULT', 'active'), True) |
261 |
self.assertIs(co.get_bool('DEFAULT', 'inactive'), False) |
|
262 |
self.assertIs(co.get_bool('UPPERCASE', 'active'), True) |
|
263 |
self.assertIs(co.get_bool('UPPERCASE', 'nonactive'), False) |
|
264 |
||
3221.7.4
by Matt Nordhoff
Add test for bug #86838. |
265 |
def test_hash_sign_in_value(self): |
266 |
"""
|
|
267 |
Before 4.5.0, ConfigObj did not quote # signs in values, so they'd be
|
|
268 |
treated as comments when read in again. (#86838)
|
|
269 |
"""
|
|
270 |
co = config.ConfigObj() |
|
271 |
co['test'] = 'foo#bar' |
|
272 |
lines = co.write() |
|
273 |
self.assertEqual(lines, ['test = "foo#bar"']) |
|
274 |
co2 = config.ConfigObj(lines) |
|
275 |
self.assertEqual(co2['test'], 'foo#bar') |
|
276 |
||
1556.2.2
by Aaron Bentley
Fixed get_bool |
277 |
|
2900.1.1
by Vincent Ladeuil
|
278 |
erroneous_config = """[section] # line 1 |
279 |
good=good # line 2
|
|
280 |
[section] # line 3
|
|
281 |
whocares=notme # line 4
|
|
282 |
"""
|
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
283 |
|
284 |
||
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
285 |
class TestConfigObjErrors(tests.TestCase): |
2900.1.1
by Vincent Ladeuil
|
286 |
|
287 |
def test_duplicate_section_name_error_line(self): |
|
288 |
try: |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
289 |
co = configobj.ConfigObj(StringIO(erroneous_config), |
290 |
raise_errors=True) |
|
2900.1.1
by Vincent Ladeuil
|
291 |
except config.configobj.DuplicateError, e: |
292 |
self.assertEqual(3, e.line_number) |
|
293 |
else: |
|
294 |
self.fail('Error in config file not detected') |
|
295 |
||
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
296 |
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
297 |
class TestConfig(tests.TestCase): |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
298 |
|
299 |
def test_constructs(self): |
|
300 |
config.Config() |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
301 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
302 |
def test_no_default_editor(self): |
303 |
self.assertRaises(NotImplementedError, config.Config().get_editor) |
|
304 |
||
305 |
def test_user_email(self): |
|
306 |
my_config = InstrumentedConfig() |
|
307 |
self.assertEqual('robert.collins@example.org', my_config.user_email()) |
|
308 |
self.assertEqual(['_get_user_id'], my_config._calls) |
|
309 |
||
310 |
def test_username(self): |
|
311 |
my_config = InstrumentedConfig() |
|
312 |
self.assertEqual('Robert Collins <robert.collins@example.org>', |
|
313 |
my_config.username()) |
|
314 |
self.assertEqual(['_get_user_id'], my_config._calls) |
|
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
315 |
|
316 |
def test_signatures_default(self): |
|
317 |
my_config = config.Config() |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
318 |
self.assertFalse(my_config.signature_needed()) |
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
319 |
self.assertEqual(config.CHECK_IF_POSSIBLE, |
320 |
my_config.signature_checking()) |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
321 |
self.assertEqual(config.SIGN_WHEN_REQUIRED, |
322 |
my_config.signing_policy()) |
|
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
323 |
|
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
324 |
def test_signatures_template_method(self): |
325 |
my_config = InstrumentedConfig() |
|
326 |
self.assertEqual(config.CHECK_NEVER, my_config.signature_checking()) |
|
327 |
self.assertEqual(['_get_signature_checking'], my_config._calls) |
|
328 |
||
329 |
def test_signatures_template_method_none(self): |
|
330 |
my_config = InstrumentedConfig() |
|
331 |
my_config._signatures = None |
|
332 |
self.assertEqual(config.CHECK_IF_POSSIBLE, |
|
333 |
my_config.signature_checking()) |
|
334 |
self.assertEqual(['_get_signature_checking'], my_config._calls) |
|
335 |
||
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
336 |
def test_gpg_signing_command_default(self): |
337 |
my_config = config.Config() |
|
338 |
self.assertEqual('gpg', my_config.gpg_signing_command()) |
|
339 |
||
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
340 |
def test_get_user_option_default(self): |
341 |
my_config = config.Config() |
|
342 |
self.assertEqual(None, my_config.get_user_option('no_option')) |
|
343 |
||
1472
by Robert Collins
post commit hook, first pass implementation |
344 |
def test_post_commit_default(self): |
345 |
my_config = config.Config() |
|
346 |
self.assertEqual(None, my_config.post_commit()) |
|
347 |
||
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
348 |
def test_log_format_default(self): |
1553.2.8
by Erik Bågfors
tests for config log_formatter |
349 |
my_config = config.Config() |
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
350 |
self.assertEqual('long', my_config.log_format()) |
1553.2.8
by Erik Bågfors
tests for config log_formatter |
351 |
|
4603.1.10
by Aaron Bentley
Provide change editor via config. |
352 |
def test_get_change_editor(self): |
353 |
my_config = InstrumentedConfig() |
|
354 |
change_editor = my_config.get_change_editor('old_tree', 'new_tree') |
|
355 |
self.assertEqual(['_get_change_editor'], my_config._calls) |
|
356 |
self.assertIs(diff.DiffFromTool, change_editor.__class__) |
|
4603.1.20
by Aaron Bentley
Use string.Template substitution with @ as delimiter. |
357 |
self.assertEqual(['vimdiff', '-fo', '@new_path', '@old_path'], |
4603.1.10
by Aaron Bentley
Provide change editor via config. |
358 |
change_editor.command_template) |
359 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
360 |
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
361 |
class TestConfigPath(tests.TestCase): |
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
362 |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
363 |
def setUp(self): |
364 |
super(TestConfigPath, self).setUp() |
|
365 |
os.environ['HOME'] = '/home/bogus' |
|
4584.3.23
by Martin Pool
Correction to xdg_cache_dir and add a simple test |
366 |
os.environ['XDG_CACHE_DIR'] = '' |
2309.2.6
by Alexander Belchenko
bzr now use Win32 API to determine Application Data location, and don't rely solely on $APPDATA |
367 |
if sys.platform == 'win32': |
368 |
os.environ['BZR_HOME'] = \ |
|
369 |
r'C:\Documents and Settings\bogus\Application Data' |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
370 |
self.bzr_home = \ |
371 |
'C:/Documents and Settings/bogus/Application Data/bazaar/2.0'
|
|
372 |
else: |
|
373 |
self.bzr_home = '/home/bogus/.bazaar' |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
374 |
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
375 |
def test_config_dir(self): |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
376 |
self.assertEqual(config.config_dir(), self.bzr_home) |
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
377 |
|
378 |
def test_config_filename(self): |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
379 |
self.assertEqual(config.config_filename(), |
380 |
self.bzr_home + '/bazaar.conf') |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
381 |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
382 |
def test_locations_config_filename(self): |
2991.2.4
by Vincent Ladeuil
Various fixes following local testing environment rebuild. |
383 |
self.assertEqual(config.locations_config_filename(), |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
384 |
self.bzr_home + '/locations.conf') |
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
385 |
|
2900.2.5
by Vincent Ladeuil
ake ftp aware of authentication config. |
386 |
def test_authentication_config_filename(self): |
2991.2.4
by Vincent Ladeuil
Various fixes following local testing environment rebuild. |
387 |
self.assertEqual(config.authentication_config_filename(), |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
388 |
self.bzr_home + '/authentication.conf') |
389 |
||
4584.3.23
by Martin Pool
Correction to xdg_cache_dir and add a simple test |
390 |
def test_xdg_cache_dir(self): |
391 |
self.assertEqual(config.xdg_cache_dir(), |
|
392 |
'/home/bogus/.cache') |
|
393 |
||
2900.2.5
by Vincent Ladeuil
ake ftp aware of authentication config. |
394 |
|
5050.13.2
by Parth Malwankar
copy config file ownership only if a new file is created |
395 |
class TestIniConfig(tests.TestCaseInTempDir): |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
396 |
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
397 |
def make_config_parser(self, s): |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
398 |
conf = config.IniBasedConfig.from_string(s) |
5345.1.4
by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method. |
399 |
return conf, conf._get_parser() |
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
400 |
|
5050.13.2
by Parth Malwankar
copy config file ownership only if a new file is created |
401 |
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
402 |
class TestIniConfigBuilding(TestIniConfig): |
403 |
||
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
404 |
def test_contructs(self): |
5345.1.1
by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig. |
405 |
my_config = config.IniBasedConfig() |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
406 |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
407 |
def test_from_fp(self): |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
408 |
my_config = config.IniBasedConfig.from_string(sample_config_text) |
5345.1.4
by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method. |
409 |
self.assertIsInstance(my_config._get_parser(), configobj.ConfigObj) |
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
410 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
411 |
def test_cached(self): |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
412 |
my_config = config.IniBasedConfig.from_string(sample_config_text) |
5345.1.4
by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method. |
413 |
parser = my_config._get_parser() |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
414 |
self.failUnless(my_config._get_parser() is parser) |
415 |
||
5050.13.1
by Parth Malwankar
fixed .bazaar ownership regression |
416 |
def _dummy_chown(self, path, uid, gid): |
417 |
self.path, self.uid, self.gid = path, uid, gid |
|
418 |
||
419 |
def test_ini_config_ownership(self): |
|
5345.5.8
by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called. |
420 |
"""Ensure that chown is happening during _write_config_file"""
|
5050.13.1
by Parth Malwankar
fixed .bazaar ownership regression |
421 |
self.requireFeature(features.chown_feature) |
422 |
self.overrideAttr(os, 'chown', self._dummy_chown) |
|
423 |
self.path = self.uid = self.gid = None |
|
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
424 |
conf = config.IniBasedConfig(file_name='./foo.conf') |
5050.13.1
by Parth Malwankar
fixed .bazaar ownership regression |
425 |
conf._write_config_file() |
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
426 |
self.assertEquals(self.path, './foo.conf') |
5050.13.1
by Parth Malwankar
fixed .bazaar ownership regression |
427 |
self.assertTrue(isinstance(self.uid, int)) |
428 |
self.assertTrue(isinstance(self.gid, int)) |
|
4840.2.5
by Vincent Ladeuil
Refactor get_user_option_as_* tests. |
429 |
|
5345.1.1
by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig. |
430 |
def test_get_filename_parameter_is_deprecated_(self): |
431 |
conf = self.callDeprecated([ |
|
432 |
'IniBasedConfig.__init__(get_filename) was deprecated in 2.3.'
|
|
433 |
' Use file_name instead.'], |
|
434 |
config.IniBasedConfig, lambda: 'ini.conf') |
|
5345.3.1
by Vincent Ladeuil
Check that _get_filename() is called and produces the desired side effect. |
435 |
self.assertEqual('ini.conf', conf.file_name) |
5345.1.1
by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig. |
436 |
|
5345.1.4
by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method. |
437 |
def test_get_parser_file_parameter_is_deprecated_(self): |
438 |
config_file = StringIO(sample_config_text.encode('utf-8')) |
|
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
439 |
conf = config.IniBasedConfig.from_string(sample_config_text) |
5345.1.4
by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method. |
440 |
conf = self.callDeprecated([ |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
441 |
'IniBasedConfig._get_parser(file=xxx) was deprecated in 2.3.'
|
442 |
' Use IniBasedConfig(_content=xxx) instead.'], |
|
443 |
conf._get_parser, file=config_file) |
|
5345.1.4
by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method. |
444 |
|
5345.1.16
by Vincent Ladeuil
Allows tests to save the config file at build time. |
445 |
class TestIniConfigSaving(tests.TestCaseInTempDir): |
446 |
||
5345.1.1
by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig. |
447 |
def test_cant_save_without_a_file_name(self): |
448 |
conf = config.IniBasedConfig() |
|
449 |
self.assertRaises(AssertionError, conf._write_config_file) |
|
450 |
||
5345.1.16
by Vincent Ladeuil
Allows tests to save the config file at build time. |
451 |
def test_saved_with_content(self): |
452 |
content = 'foo = bar\n' |
|
5345.1.26
by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts |
453 |
conf = config.IniBasedConfig.from_string( |
5345.1.25
by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts. |
454 |
content, file_name='./test.conf', save=True) |
5345.1.16
by Vincent Ladeuil
Allows tests to save the config file at build time. |
455 |
self.assertFileEqual(content, 'test.conf') |
456 |
||
4840.2.5
by Vincent Ladeuil
Refactor get_user_option_as_* tests. |
457 |
|
5345.5.1
by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it. |
458 |
class TestIniBaseConfigOnDisk(tests.TestCaseInTempDir): |
459 |
||
460 |
def test_cannot_reload_without_name(self): |
|
5345.5.13
by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts |
461 |
conf = config.IniBasedConfig.from_string(sample_config_text) |
5345.5.1
by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it. |
462 |
self.assertRaises(AssertionError, conf.reload) |
463 |
||
464 |
def test_reload_see_new_value(self): |
|
5345.5.13
by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts |
465 |
c1 = config.IniBasedConfig.from_string('editor=vim\n', |
466 |
file_name='./test/conf') |
|
5345.5.1
by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it. |
467 |
c1._write_config_file() |
5345.5.13
by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts |
468 |
c2 = config.IniBasedConfig.from_string('editor=emacs\n', |
469 |
file_name='./test/conf') |
|
5345.5.1
by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it. |
470 |
c2._write_config_file() |
471 |
self.assertEqual('vim', c1.get_user_option('editor')) |
|
472 |
self.assertEqual('emacs', c2.get_user_option('editor')) |
|
473 |
# Make sure we get the Right value
|
|
474 |
c1.reload() |
|
475 |
self.assertEqual('emacs', c1.get_user_option('editor')) |
|
476 |
||
477 |
||
5345.1.7
by Vincent Ladeuil
Start LockableConfig tests. |
478 |
class TestLockableConfig(tests.TestCaseInTempDir): |
479 |
||
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
480 |
# Set by load_tests
|
481 |
config_class = None |
|
482 |
config_args = None |
|
483 |
config_section = None |
|
5345.1.7
by Vincent Ladeuil
Start LockableConfig tests. |
484 |
|
485 |
def setUp(self): |
|
486 |
super(TestLockableConfig, self).setUp() |
|
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
487 |
self._content = '[%s]\none=1\ntwo=2\n' % (self.config_section,) |
5345.1.7
by Vincent Ladeuil
Start LockableConfig tests. |
488 |
self.config = self.create_config(self._content) |
489 |
||
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
490 |
def get_existing_config(self): |
491 |
return self.config_class(*self.config_args) |
|
492 |
||
5345.1.7
by Vincent Ladeuil
Start LockableConfig tests. |
493 |
def create_config(self, content): |
5396.1.1
by Vincent Ladeuil
Fix python-2.6-ism. |
494 |
kwargs = dict(save=True) |
495 |
c = self.config_class.from_string(content, *self.config_args, **kwargs) |
|
5345.1.7
by Vincent Ladeuil
Start LockableConfig tests. |
496 |
return c |
497 |
||
498 |
def test_simple_read_access(self): |
|
499 |
self.assertEquals('1', self.config.get_user_option('one')) |
|
500 |
||
501 |
def test_simple_write_access(self): |
|
502 |
self.config.set_user_option('one', 'one') |
|
503 |
self.assertEquals('one', self.config.get_user_option('one')) |
|
504 |
||
5345.1.8
by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts. |
505 |
def test_listen_to_the_last_speaker(self): |
506 |
c1 = self.config |
|
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
507 |
c2 = self.get_existing_config() |
5345.1.8
by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts. |
508 |
c1.set_user_option('one', 'ONE') |
509 |
c2.set_user_option('two', 'TWO') |
|
510 |
self.assertEquals('ONE', c1.get_user_option('one')) |
|
511 |
self.assertEquals('TWO', c2.get_user_option('two')) |
|
512 |
# The second update respect the first one
|
|
513 |
self.assertEquals('ONE', c2.get_user_option('one')) |
|
514 |
||
5345.5.3
by Vincent Ladeuil
Add a test for concurrent writers ensuring the values propagate. |
515 |
def test_last_speaker_wins(self): |
516 |
# If the same config is not shared, the same variable modified twice
|
|
517 |
# can only see a single result.
|
|
518 |
c1 = self.config |
|
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
519 |
c2 = self.get_existing_config() |
5345.5.3
by Vincent Ladeuil
Add a test for concurrent writers ensuring the values propagate. |
520 |
c1.set_user_option('one', 'c1') |
521 |
c2.set_user_option('one', 'c2') |
|
522 |
self.assertEquals('c2', c2._get_user_option('one')) |
|
523 |
# The first modification is still available until another refresh
|
|
524 |
# occur
|
|
525 |
self.assertEquals('c1', c1._get_user_option('one')) |
|
526 |
c1.set_user_option('two', 'done') |
|
527 |
self.assertEquals('c2', c1._get_user_option('one')) |
|
528 |
||
5345.5.4
by Vincent Ladeuil
Start implementing config files locking. |
529 |
def test_writes_are_serialized(self): |
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
530 |
c1 = self.config |
531 |
c2 = self.get_existing_config() |
|
5345.5.4
by Vincent Ladeuil
Start implementing config files locking. |
532 |
|
533 |
# We spawn a thread that will pause *during* the write
|
|
534 |
before_writing = threading.Event() |
|
535 |
after_writing = threading.Event() |
|
536 |
writing_done = threading.Event() |
|
537 |
c1_orig = c1._write_config_file |
|
538 |
def c1_write_config_file(): |
|
539 |
before_writing.set() |
|
540 |
c1_orig() |
|
541 |
# The lock is held we wait for the main thread to decide when to
|
|
542 |
# continue
|
|
543 |
after_writing.wait() |
|
544 |
c1._write_config_file = c1_write_config_file |
|
545 |
def c1_set_option(): |
|
546 |
c1.set_user_option('one', 'c1') |
|
547 |
writing_done.set() |
|
548 |
t1 = threading.Thread(target=c1_set_option) |
|
549 |
# Collect the thread after the test
|
|
550 |
self.addCleanup(t1.join) |
|
551 |
# Be ready to unblock the thread if the test goes wrong
|
|
552 |
self.addCleanup(after_writing.set) |
|
553 |
t1.start() |
|
554 |
before_writing.wait() |
|
555 |
self.assertTrue(c1._lock.is_held) |
|
556 |
self.assertRaises(errors.LockContention, |
|
557 |
c2.set_user_option, 'one', 'c2') |
|
558 |
self.assertEquals('c1', c1.get_user_option('one')) |
|
559 |
# Let the lock be released
|
|
560 |
after_writing.set() |
|
561 |
writing_done.wait() |
|
562 |
c2.set_user_option('one', 'c2') |
|
563 |
self.assertEquals('c2', c2.get_user_option('one')) |
|
564 |
||
5345.5.7
by Vincent Ladeuil
Make LocationConfig use a lock too. |
565 |
def test_read_while_writing(self): |
566 |
c1 = self.config |
|
567 |
# We spawn a thread that will pause *during* the write
|
|
568 |
ready_to_write = threading.Event() |
|
569 |
do_writing = threading.Event() |
|
570 |
writing_done = threading.Event() |
|
571 |
c1_orig = c1._write_config_file |
|
572 |
def c1_write_config_file(): |
|
573 |
ready_to_write.set() |
|
574 |
# The lock is held we wait for the main thread to decide when to
|
|
575 |
# continue
|
|
576 |
do_writing.wait() |
|
577 |
c1_orig() |
|
578 |
writing_done.set() |
|
579 |
c1._write_config_file = c1_write_config_file |
|
580 |
def c1_set_option(): |
|
581 |
c1.set_user_option('one', 'c1') |
|
582 |
t1 = threading.Thread(target=c1_set_option) |
|
583 |
# Collect the thread after the test
|
|
584 |
self.addCleanup(t1.join) |
|
585 |
# Be ready to unblock the thread if the test goes wrong
|
|
586 |
self.addCleanup(do_writing.set) |
|
587 |
t1.start() |
|
588 |
# Ensure the thread is ready to write
|
|
589 |
ready_to_write.wait() |
|
590 |
self.assertTrue(c1._lock.is_held) |
|
591 |
self.assertEquals('c1', c1.get_user_option('one')) |
|
592 |
# If we read during the write, we get the old value
|
|
593 |
c2 = self.get_existing_config() |
|
594 |
self.assertEquals('1', c2.get_user_option('one')) |
|
595 |
# Let the writing occur and ensure it occurred
|
|
596 |
do_writing.set() |
|
597 |
writing_done.wait() |
|
598 |
# Now we get the updated value
|
|
599 |
c3 = self.get_existing_config() |
|
600 |
self.assertEquals('c1', c3.get_user_option('one')) |
|
601 |
||
5345.1.7
by Vincent Ladeuil
Start LockableConfig tests. |
602 |
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
603 |
class TestGetUserOptionAs(TestIniConfig): |
4840.2.5
by Vincent Ladeuil
Refactor get_user_option_as_* tests. |
604 |
|
4503.2.2
by Vincent Ladeuil
Get a bool or none from a config file. |
605 |
def test_get_user_option_as_bool(self): |
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
606 |
conf, parser = self.make_config_parser(""" |
4503.2.2
by Vincent Ladeuil
Get a bool or none from a config file. |
607 |
a_true_bool = true
|
608 |
a_false_bool = 0
|
|
609 |
an_invalid_bool = maybe
|
|
4840.2.4
by Vincent Ladeuil
Implement config.get_user_option_as_list. |
610 |
a_list = hmm, who knows ? # This is interpreted as a list !
|
4840.2.5
by Vincent Ladeuil
Refactor get_user_option_as_* tests. |
611 |
""") |
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
612 |
get_bool = conf.get_user_option_as_bool |
613 |
self.assertEqual(True, get_bool('a_true_bool')) |
|
614 |
self.assertEqual(False, get_bool('a_false_bool')) |
|
4989.2.12
by Vincent Ladeuil
Display a warning if an option value is not boolean. |
615 |
warnings = [] |
616 |
def warning(*args): |
|
617 |
warnings.append(args[0] % args[1:]) |
|
618 |
self.overrideAttr(trace, 'warning', warning) |
|
619 |
msg = 'Value "%s" is not a boolean for "%s"' |
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
620 |
self.assertIs(None, get_bool('an_invalid_bool')) |
4989.2.12
by Vincent Ladeuil
Display a warning if an option value is not boolean. |
621 |
self.assertEquals(msg % ('maybe', 'an_invalid_bool'), warnings[0]) |
622 |
warnings = [] |
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
623 |
self.assertIs(None, get_bool('not_defined_in_this_config')) |
4989.2.12
by Vincent Ladeuil
Display a warning if an option value is not boolean. |
624 |
self.assertEquals([], warnings) |
4840.2.4
by Vincent Ladeuil
Implement config.get_user_option_as_list. |
625 |
|
626 |
def test_get_user_option_as_list(self): |
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
627 |
conf, parser = self.make_config_parser(""" |
4840.2.4
by Vincent Ladeuil
Implement config.get_user_option_as_list. |
628 |
a_list = a,b,c
|
629 |
length_1 = 1,
|
|
630 |
one_item = x
|
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
631 |
""") |
632 |
get_list = conf.get_user_option_as_list |
|
4840.2.4
by Vincent Ladeuil
Implement config.get_user_option_as_list. |
633 |
self.assertEqual(['a', 'b', 'c'], get_list('a_list')) |
634 |
self.assertEqual(['1'], get_list('length_1')) |
|
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
635 |
self.assertEqual('x', conf.get_user_option('one_item')) |
4840.2.4
by Vincent Ladeuil
Implement config.get_user_option_as_list. |
636 |
# automatically cast to list
|
637 |
self.assertEqual(['x'], get_list('one_item')) |
|
638 |
||
639 |
||
4840.2.6
by Vincent Ladeuil
Implement config.suppress_warning. |
640 |
class TestSupressWarning(TestIniConfig): |
641 |
||
642 |
def make_warnings_config(self, s): |
|
643 |
conf, parser = self.make_config_parser(s) |
|
644 |
return conf.suppress_warning |
|
645 |
||
646 |
def test_suppress_warning_unknown(self): |
|
647 |
suppress_warning = self.make_warnings_config('') |
|
648 |
self.assertEqual(False, suppress_warning('unknown_warning')) |
|
649 |
||
650 |
def test_suppress_warning_known(self): |
|
651 |
suppress_warning = self.make_warnings_config('suppress_warnings=a,b') |
|
652 |
self.assertEqual(False, suppress_warning('c')) |
|
653 |
self.assertEqual(True, suppress_warning('a')) |
|
654 |
self.assertEqual(True, suppress_warning('b')) |
|
655 |
||
656 |
||
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
657 |
class TestGetConfig(tests.TestCase): |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
658 |
|
659 |
def test_constructs(self): |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
660 |
my_config = config.GlobalConfig() |
661 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
662 |
def test_calls_read_filenames(self): |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
663 |
# replace the class that is constructed, to check its parameters
|
1474
by Robert Collins
Merge from Aaron Bentley. |
664 |
oldparserclass = config.ConfigObj |
665 |
config.ConfigObj = InstrumentedConfigObj |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
666 |
my_config = config.GlobalConfig() |
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
667 |
try: |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
668 |
parser = my_config._get_parser() |
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
669 |
finally: |
1474
by Robert Collins
Merge from Aaron Bentley. |
670 |
config.ConfigObj = oldparserclass |
671 |
self.failUnless(isinstance(parser, InstrumentedConfigObj)) |
|
1551.2.20
by Aaron Bentley
Treated config files as utf-8 |
672 |
self.assertEqual(parser._calls, [('__init__', config.config_filename(), |
673 |
'utf-8')]) |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
674 |
|
675 |
||
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
676 |
class TestBranchConfig(tests.TestCaseWithTransport): |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
677 |
|
678 |
def test_constructs(self): |
|
679 |
branch = FakeBranch() |
|
680 |
my_config = config.BranchConfig(branch) |
|
681 |
self.assertRaises(TypeError, config.BranchConfig) |
|
682 |
||
683 |
def test_get_location_config(self): |
|
684 |
branch = FakeBranch() |
|
685 |
my_config = config.BranchConfig(branch) |
|
686 |
location_config = my_config._get_location_config() |
|
687 |
self.assertEqual(branch.base, location_config.location) |
|
688 |
self.failUnless(location_config is my_config._get_location_config()) |
|
689 |
||
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
690 |
def test_get_config(self): |
691 |
"""The Branch.get_config method works properly"""
|
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
692 |
b = bzrdir.BzrDir.create_standalone_workingtree('.').branch |
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
693 |
my_config = b.get_config() |
694 |
self.assertIs(my_config.get_user_option('wacky'), None) |
|
695 |
my_config.set_user_option('wacky', 'unlikely') |
|
696 |
self.assertEqual(my_config.get_user_option('wacky'), 'unlikely') |
|
697 |
||
698 |
# Ensure we get the same thing if we start again
|
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
699 |
b2 = branch.Branch.open('.') |
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
700 |
my_config2 = b2.get_config() |
701 |
self.assertEqual(my_config2.get_user_option('wacky'), 'unlikely') |
|
702 |
||
1824.1.1
by Robert Collins
Add BranchConfig.has_explicit_nickname call. |
703 |
def test_has_explicit_nickname(self): |
704 |
b = self.make_branch('.') |
|
705 |
self.assertFalse(b.get_config().has_explicit_nickname()) |
|
706 |
b.nick = 'foo' |
|
707 |
self.assertTrue(b.get_config().has_explicit_nickname()) |
|
708 |
||
1878.1.1
by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653) |
709 |
def test_config_url(self): |
710 |
"""The Branch.get_config will use section that uses a local url"""
|
|
711 |
branch = self.make_branch('branch') |
|
712 |
self.assertEqual('branch', branch.nick) |
|
713 |
||
714 |
local_url = urlutils.local_path_to_url('branch') |
|
5345.1.26
by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts |
715 |
conf = config.LocationConfig.from_string( |
5345.1.25
by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts. |
716 |
'[%s]\nnickname = foobar' % (local_url,), |
717 |
local_url, save=True) |
|
1878.1.1
by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653) |
718 |
self.assertEqual('foobar', branch.nick) |
719 |
||
720 |
def test_config_local_path(self): |
|
721 |
"""The Branch.get_config will use a local system path"""
|
|
722 |
branch = self.make_branch('branch') |
|
723 |
self.assertEqual('branch', branch.nick) |
|
724 |
||
5345.1.12
by Vincent Ladeuil
Cleanup test_config some more. |
725 |
local_path = osutils.getcwd().encode('utf8') |
5345.1.26
by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts |
726 |
conf = config.LocationConfig.from_string( |
5345.1.25
by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts. |
727 |
'[%s/branch]\nnickname = barry' % (local_path,), |
728 |
'branch', save=True) |
|
1878.1.1
by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653) |
729 |
self.assertEqual('barry', branch.nick) |
730 |
||
1878.1.2
by John Arbash Meinel
Add a test that new locations.conf entries are created with a local path, rather than a URL |
731 |
def test_config_creates_local(self): |
732 |
"""Creating a new entry in config uses a local path."""
|
|
2230.3.6
by Aaron Bentley
work in progress bind stuff |
733 |
branch = self.make_branch('branch', format='knit') |
1878.1.2
by John Arbash Meinel
Add a test that new locations.conf entries are created with a local path, rather than a URL |
734 |
branch.set_push_location('http://foobar') |
735 |
local_path = osutils.getcwd().encode('utf8') |
|
736 |
# Surprisingly ConfigObj doesn't create a trailing newline
|
|
5345.1.12
by Vincent Ladeuil
Cleanup test_config some more. |
737 |
self.check_file_contents(config.locations_config_filename(), |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
738 |
'[%s/branch]\n' |
739 |
'push_location = http://foobar\n' |
|
3221.7.1
by Matt Nordhoff
Upgrade ConfigObj to version 4.5.1. |
740 |
'push_location:policy = norecurse\n' |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
741 |
% (local_path,)) |
1878.1.2
by John Arbash Meinel
Add a test that new locations.conf entries are created with a local path, rather than a URL |
742 |
|
2120.5.4
by Alexander Belchenko
Whitebox test for Config.get_nickname (req. by Aaron Bentley) |
743 |
def test_autonick_urlencoded(self): |
744 |
b = self.make_branch('!repo') |
|
745 |
self.assertEqual('!repo', b.get_config().get_nickname()) |
|
746 |
||
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
747 |
def test_warn_if_masked(self): |
748 |
warnings = [] |
|
749 |
def warning(*args): |
|
750 |
warnings.append(args[0] % args[1:]) |
|
5345.1.12
by Vincent Ladeuil
Cleanup test_config some more. |
751 |
self.overrideAttr(trace, 'warning', warning) |
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
752 |
|
753 |
def set_option(store, warn_masked=True): |
|
754 |
warnings[:] = [] |
|
755 |
conf.set_user_option('example_option', repr(store), store=store, |
|
756 |
warn_masked=warn_masked) |
|
757 |
def assertWarning(warning): |
|
758 |
if warning is None: |
|
759 |
self.assertEqual(0, len(warnings)) |
|
760 |
else: |
|
761 |
self.assertEqual(1, len(warnings)) |
|
762 |
self.assertEqual(warning, warnings[0]) |
|
5345.1.12
by Vincent Ladeuil
Cleanup test_config some more. |
763 |
branch = self.make_branch('.') |
764 |
conf = branch.get_config() |
|
765 |
set_option(config.STORE_GLOBAL) |
|
766 |
assertWarning(None) |
|
767 |
set_option(config.STORE_BRANCH) |
|
768 |
assertWarning(None) |
|
769 |
set_option(config.STORE_GLOBAL) |
|
770 |
assertWarning('Value "4" is masked by "3" from branch.conf') |
|
771 |
set_option(config.STORE_GLOBAL, warn_masked=False) |
|
772 |
assertWarning(None) |
|
773 |
set_option(config.STORE_LOCATION) |
|
774 |
assertWarning(None) |
|
775 |
set_option(config.STORE_BRANCH) |
|
776 |
assertWarning('Value "3" is masked by "0" from locations.conf') |
|
777 |
set_option(config.STORE_BRANCH, warn_masked=False) |
|
778 |
assertWarning(None) |
|
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
779 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
780 |
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
781 |
class TestGlobalConfigItems(tests.TestCase): |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
782 |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
783 |
def test_user_id(self): |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
784 |
my_config = config.GlobalConfig.from_string(sample_config_text) |
1551.2.21
by Aaron Bentley
Formatted unicode config tests as ASCII |
785 |
self.assertEqual(u"Erik B\u00e5gfors <erik@bagfors.nu>", |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
786 |
my_config._get_user_id()) |
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
787 |
|
788 |
def test_absent_user_id(self): |
|
5345.2.2
by Vincent Ladeuil
Simplify test config building. |
789 |
my_config = config.GlobalConfig() |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
790 |
self.assertEqual(None, my_config._get_user_id()) |
791 |
||
792 |
def test_configured_editor(self): |
|
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
793 |
my_config = config.GlobalConfig.from_string(sample_config_text) |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
794 |
self.assertEqual("vim", my_config.get_editor()) |
795 |
||
1442.1.17
by Robert Collins
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking |
796 |
def test_signatures_always(self): |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
797 |
my_config = config.GlobalConfig.from_string(sample_always_signatures) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
798 |
self.assertEqual(config.CHECK_NEVER, |
1442.1.17
by Robert Collins
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking |
799 |
my_config.signature_checking()) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
800 |
self.assertEqual(config.SIGN_ALWAYS, |
801 |
my_config.signing_policy()) |
|
1442.1.21
by Robert Collins
create signature_needed() call for commit to trigger creating signatures |
802 |
self.assertEqual(True, my_config.signature_needed()) |
1442.1.17
by Robert Collins
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking |
803 |
|
804 |
def test_signatures_if_possible(self): |
|
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
805 |
my_config = config.GlobalConfig.from_string(sample_maybe_signatures) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
806 |
self.assertEqual(config.CHECK_NEVER, |
1442.1.17
by Robert Collins
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking |
807 |
my_config.signature_checking()) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
808 |
self.assertEqual(config.SIGN_WHEN_REQUIRED, |
809 |
my_config.signing_policy()) |
|
1442.1.21
by Robert Collins
create signature_needed() call for commit to trigger creating signatures |
810 |
self.assertEqual(False, my_config.signature_needed()) |
1442.1.17
by Robert Collins
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking |
811 |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
812 |
def test_signatures_ignore(self): |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
813 |
my_config = config.GlobalConfig.from_string(sample_ignore_signatures) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
814 |
self.assertEqual(config.CHECK_ALWAYS, |
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
815 |
my_config.signature_checking()) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
816 |
self.assertEqual(config.SIGN_NEVER, |
817 |
my_config.signing_policy()) |
|
1442.1.21
by Robert Collins
create signature_needed() call for commit to trigger creating signatures |
818 |
self.assertEqual(False, my_config.signature_needed()) |
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
819 |
|
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
820 |
def _get_sample_config(self): |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
821 |
my_config = config.GlobalConfig.from_string(sample_config_text) |
1534.7.154
by Aaron Bentley
Removed changes from bzr.ab 1529..1536 |
822 |
return my_config |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
823 |
|
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
824 |
def test_gpg_signing_command(self): |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
825 |
my_config = self._get_sample_config() |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
826 |
self.assertEqual("gnome-gpg", my_config.gpg_signing_command()) |
827 |
self.assertEqual(False, my_config.signature_needed()) |
|
828 |
||
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
829 |
def _get_empty_config(self): |
5345.2.2
by Vincent Ladeuil
Simplify test config building. |
830 |
my_config = config.GlobalConfig() |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
831 |
return my_config |
832 |
||
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
833 |
def test_gpg_signing_command_unset(self): |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
834 |
my_config = self._get_empty_config() |
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
835 |
self.assertEqual("gpg", my_config.gpg_signing_command()) |
836 |
||
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
837 |
def test_get_user_option_default(self): |
838 |
my_config = self._get_empty_config() |
|
839 |
self.assertEqual(None, my_config.get_user_option('no_option')) |
|
840 |
||
841 |
def test_get_user_option_global(self): |
|
842 |
my_config = self._get_sample_config() |
|
843 |
self.assertEqual("something", |
|
844 |
my_config.get_user_option('user_global_option')) |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
845 |
|
1472
by Robert Collins
post commit hook, first pass implementation |
846 |
def test_post_commit_default(self): |
847 |
my_config = self._get_sample_config() |
|
848 |
self.assertEqual(None, my_config.post_commit()) |
|
849 |
||
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
850 |
def test_configured_logformat(self): |
1553.2.8
by Erik Bågfors
tests for config log_formatter |
851 |
my_config = self._get_sample_config() |
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
852 |
self.assertEqual("short", my_config.log_format()) |
1553.2.8
by Erik Bågfors
tests for config log_formatter |
853 |
|
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
854 |
def test_get_alias(self): |
855 |
my_config = self._get_sample_config() |
|
856 |
self.assertEqual('help', my_config.get_alias('h')) |
|
857 |
||
2900.3.6
by Tim Penhey
Added tests. |
858 |
def test_get_aliases(self): |
859 |
my_config = self._get_sample_config() |
|
860 |
aliases = my_config.get_aliases() |
|
861 |
self.assertEqual(2, len(aliases)) |
|
862 |
sorted_keys = sorted(aliases) |
|
863 |
self.assertEqual('help', aliases[sorted_keys[0]]) |
|
864 |
self.assertEqual(sample_long_alias, aliases[sorted_keys[1]]) |
|
865 |
||
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
866 |
def test_get_no_alias(self): |
867 |
my_config = self._get_sample_config() |
|
868 |
self.assertEqual(None, my_config.get_alias('foo')) |
|
869 |
||
870 |
def test_get_long_alias(self): |
|
871 |
my_config = self._get_sample_config() |
|
872 |
self.assertEqual(sample_long_alias, my_config.get_alias('ll')) |
|
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
873 |
|
4603.1.10
by Aaron Bentley
Provide change editor via config. |
874 |
def test_get_change_editor(self): |
875 |
my_config = self._get_sample_config() |
|
876 |
change_editor = my_config.get_change_editor('old', 'new') |
|
877 |
self.assertIs(diff.DiffFromTool, change_editor.__class__) |
|
4603.1.20
by Aaron Bentley
Use string.Template substitution with @ as delimiter. |
878 |
self.assertEqual('vimdiff -of @new_path @old_path', |
4603.1.10
by Aaron Bentley
Provide change editor via config. |
879 |
' '.join(change_editor.command_template)) |
880 |
||
881 |
def test_get_no_change_editor(self): |
|
882 |
my_config = self._get_empty_config() |
|
883 |
change_editor = my_config.get_change_editor('old', 'new') |
|
884 |
self.assertIs(None, change_editor) |
|
885 |
||
1704.2.18
by Martin Pool
Remove duplicated TestLocationConfig and update previously hidden tests. (#32587) |
886 |
|
2900.3.6
by Tim Penhey
Added tests. |
887 |
class TestGlobalConfigSavingOptions(tests.TestCaseInTempDir): |
888 |
||
889 |
def test_empty(self): |
|
890 |
my_config = config.GlobalConfig() |
|
891 |
self.assertEqual(0, len(my_config.get_aliases())) |
|
892 |
||
893 |
def test_set_alias(self): |
|
894 |
my_config = config.GlobalConfig() |
|
895 |
alias_value = 'commit --strict' |
|
896 |
my_config.set_alias('commit', alias_value) |
|
897 |
new_config = config.GlobalConfig() |
|
898 |
self.assertEqual(alias_value, new_config.get_alias('commit')) |
|
899 |
||
900 |
def test_remove_alias(self): |
|
901 |
my_config = config.GlobalConfig() |
|
902 |
my_config.set_alias('commit', 'commit --strict') |
|
903 |
# Now remove the alias again.
|
|
904 |
my_config.unset_alias('commit') |
|
905 |
new_config = config.GlobalConfig() |
|
906 |
self.assertIs(None, new_config.get_alias('commit')) |
|
907 |
||
908 |
||
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
909 |
class TestLocationConfig(tests.TestCaseInTempDir): |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
910 |
|
911 |
def test_constructs(self): |
|
912 |
my_config = config.LocationConfig('http://example.com') |
|
913 |
self.assertRaises(TypeError, config.LocationConfig) |
|
914 |
||
915 |
def test_branch_calls_read_filenames(self): |
|
1474
by Robert Collins
Merge from Aaron Bentley. |
916 |
# This is testing the correct file names are provided.
|
917 |
# TODO: consolidate with the test for GlobalConfigs filename checks.
|
|
918 |
#
|
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
919 |
# replace the class that is constructed, to check its parameters
|
1474
by Robert Collins
Merge from Aaron Bentley. |
920 |
oldparserclass = config.ConfigObj |
921 |
config.ConfigObj = InstrumentedConfigObj |
|
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
922 |
try: |
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
923 |
my_config = config.LocationConfig('http://www.example.com') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
924 |
parser = my_config._get_parser() |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
925 |
finally: |
1474
by Robert Collins
Merge from Aaron Bentley. |
926 |
config.ConfigObj = oldparserclass |
927 |
self.failUnless(isinstance(parser, InstrumentedConfigObj)) |
|
928 |
self.assertEqual(parser._calls, |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
929 |
[('__init__', config.locations_config_filename(), |
1704.2.18
by Martin Pool
Remove duplicated TestLocationConfig and update previously hidden tests. (#32587) |
930 |
'utf-8')]) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
931 |
|
932 |
def test_get_global_config(self): |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
933 |
my_config = config.BranchConfig(FakeBranch('http://example.com')) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
934 |
global_config = my_config._get_global_config() |
935 |
self.failUnless(isinstance(global_config, config.GlobalConfig)) |
|
936 |
self.failUnless(global_config is my_config._get_global_config()) |
|
937 |
||
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
938 |
def test__get_matching_sections_no_match(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
939 |
self.get_branch_config('/') |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
940 |
self.assertEqual([], self.my_location_config._get_matching_sections()) |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
941 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
942 |
def test__get_matching_sections_exact(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
943 |
self.get_branch_config('http://www.example.com') |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
944 |
self.assertEqual([('http://www.example.com', '')], |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
945 |
self.my_location_config._get_matching_sections()) |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
946 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
947 |
def test__get_matching_sections_suffix_does_not(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
948 |
self.get_branch_config('http://www.example.com-com') |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
949 |
self.assertEqual([], self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
950 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
951 |
def test__get_matching_sections_subdir_recursive(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
952 |
self.get_branch_config('http://www.example.com/com') |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
953 |
self.assertEqual([('http://www.example.com', 'com')], |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
954 |
self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
955 |
|
1993.3.5
by James Henstridge
add back recurse=False option to config file |
956 |
def test__get_matching_sections_ignoreparent(self): |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
957 |
self.get_branch_config('http://www.example.com/ignoreparent') |
958 |
self.assertEqual([('http://www.example.com/ignoreparent', '')], |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
959 |
self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
960 |
|
1993.3.5
by James Henstridge
add back recurse=False option to config file |
961 |
def test__get_matching_sections_ignoreparent_subdir(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
962 |
self.get_branch_config( |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
963 |
'http://www.example.com/ignoreparent/childbranch') |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
964 |
self.assertEqual([('http://www.example.com/ignoreparent', |
965 |
'childbranch')], |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
966 |
self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
967 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
968 |
def test__get_matching_sections_subdir_trailing_slash(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
969 |
self.get_branch_config('/b') |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
970 |
self.assertEqual([('/b/', '')], |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
971 |
self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
972 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
973 |
def test__get_matching_sections_subdir_child(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
974 |
self.get_branch_config('/a/foo') |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
975 |
self.assertEqual([('/a/*', ''), ('/a/', 'foo')], |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
976 |
self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
977 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
978 |
def test__get_matching_sections_subdir_child_child(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
979 |
self.get_branch_config('/a/foo/bar') |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
980 |
self.assertEqual([('/a/*', 'bar'), ('/a/', 'foo/bar')], |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
981 |
self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
982 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
983 |
def test__get_matching_sections_trailing_slash_with_children(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
984 |
self.get_branch_config('/a/') |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
985 |
self.assertEqual([('/a/', '')], |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
986 |
self.my_location_config._get_matching_sections()) |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
987 |
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
988 |
def test__get_matching_sections_explicit_over_glob(self): |
989 |
# XXX: 2006-09-08 jamesh
|
|
990 |
# This test only passes because ord('c') > ord('*'). If there
|
|
991 |
# was a config section for '/a/?', it would get precedence
|
|
992 |
# over '/a/c'.
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
993 |
self.get_branch_config('/a/c') |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
994 |
self.assertEqual([('/a/c', ''), ('/a/*', ''), ('/a/', 'c')], |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
995 |
self.my_location_config._get_matching_sections()) |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
996 |
|
2120.6.3
by James Henstridge
add some more tests for getting policy options, and behaviour of get_user_option in the presence of config policies |
997 |
def test__get_option_policy_normal(self): |
998 |
self.get_branch_config('http://www.example.com') |
|
999 |
self.assertEqual( |
|
1000 |
self.my_location_config._get_config_policy( |
|
1001 |
'http://www.example.com', 'normal_option'), |
|
1002 |
config.POLICY_NONE) |
|
1003 |
||
1004 |
def test__get_option_policy_norecurse(self): |
|
1005 |
self.get_branch_config('http://www.example.com') |
|
1006 |
self.assertEqual( |
|
1007 |
self.my_location_config._get_option_policy( |
|
1008 |
'http://www.example.com', 'norecurse_option'), |
|
1009 |
config.POLICY_NORECURSE) |
|
1010 |
# Test old recurse=False setting:
|
|
1011 |
self.assertEqual( |
|
1012 |
self.my_location_config._get_option_policy( |
|
1013 |
'http://www.example.com/norecurse', 'normal_option'), |
|
1014 |
config.POLICY_NORECURSE) |
|
1015 |
||
1016 |
def test__get_option_policy_normal(self): |
|
1017 |
self.get_branch_config('http://www.example.com') |
|
1018 |
self.assertEqual( |
|
1019 |
self.my_location_config._get_option_policy( |
|
1020 |
'http://www.example.com', 'appendpath_option'), |
|
1021 |
config.POLICY_APPENDPATH) |
|
1022 |
||
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
1023 |
def test_location_without_username(self): |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
1024 |
self.get_branch_config('http://www.example.com/ignoreparent') |
1704.2.18
by Martin Pool
Remove duplicated TestLocationConfig and update previously hidden tests. (#32587) |
1025 |
self.assertEqual(u'Erik B\u00e5gfors <erik@bagfors.nu>', |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
1026 |
self.my_config.username()) |
1027 |
||
1028 |
def test_location_not_listed(self): |
|
1704.2.18
by Martin Pool
Remove duplicated TestLocationConfig and update previously hidden tests. (#32587) |
1029 |
"""Test that the global username is used when no location matches"""
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1030 |
self.get_branch_config('/home/robertc/sources') |
1704.2.18
by Martin Pool
Remove duplicated TestLocationConfig and update previously hidden tests. (#32587) |
1031 |
self.assertEqual(u'Erik B\u00e5gfors <erik@bagfors.nu>', |
1442.1.8
by Robert Collins
preparing some tests for LocationConfig |
1032 |
self.my_config.username()) |
1033 |
||
1442.1.13
by Robert Collins
branches.conf is now able to override the users email |
1034 |
def test_overriding_location(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1035 |
self.get_branch_config('http://www.example.com/foo') |
1442.1.13
by Robert Collins
branches.conf is now able to override the users email |
1036 |
self.assertEqual('Robert Collins <robertc@example.org>', |
1037 |
self.my_config.username()) |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
1038 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
1039 |
def test_signatures_not_set(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1040 |
self.get_branch_config('http://www.example.com', |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
1041 |
global_config=sample_ignore_signatures) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
1042 |
self.assertEqual(config.CHECK_ALWAYS, |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
1043 |
self.my_config.signature_checking()) |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
1044 |
self.assertEqual(config.SIGN_NEVER, |
1045 |
self.my_config.signing_policy()) |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
1046 |
|
1047 |
def test_signatures_never(self): |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1048 |
self.get_branch_config('/a/c') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
1049 |
self.assertEqual(config.CHECK_NEVER, |
1050 |
self.my_config.signature_checking()) |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1051 |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
1052 |
def test_signatures_when_available(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1053 |
self.get_branch_config('/a/', global_config=sample_ignore_signatures) |
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
1054 |
self.assertEqual(config.CHECK_IF_POSSIBLE, |
1055 |
self.my_config.signature_checking()) |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1056 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
1057 |
def test_signatures_always(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1058 |
self.get_branch_config('/b') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
1059 |
self.assertEqual(config.CHECK_ALWAYS, |
1060 |
self.my_config.signature_checking()) |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1061 |
|
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
1062 |
def test_gpg_signing_command(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1063 |
self.get_branch_config('/b') |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
1064 |
self.assertEqual("gnome-gpg", self.my_config.gpg_signing_command()) |
1065 |
||
1066 |
def test_gpg_signing_command_missing(self): |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1067 |
self.get_branch_config('/a') |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
1068 |
self.assertEqual("false", self.my_config.gpg_signing_command()) |
1069 |
||
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
1070 |
def test_get_user_option_global(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1071 |
self.get_branch_config('/a') |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
1072 |
self.assertEqual('something', |
1073 |
self.my_config.get_user_option('user_global_option')) |
|
1074 |
||
1075 |
def test_get_user_option_local(self): |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1076 |
self.get_branch_config('/a') |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
1077 |
self.assertEqual('local', |
1078 |
self.my_config.get_user_option('user_local_option')) |
|
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
1079 |
|
2120.6.3
by James Henstridge
add some more tests for getting policy options, and behaviour of get_user_option in the presence of config policies |
1080 |
def test_get_user_option_appendpath(self): |
1081 |
# returned as is for the base path:
|
|
1082 |
self.get_branch_config('http://www.example.com') |
|
1083 |
self.assertEqual('append', |
|
1084 |
self.my_config.get_user_option('appendpath_option')) |
|
1085 |
# Extra path components get appended:
|
|
1086 |
self.get_branch_config('http://www.example.com/a/b/c') |
|
1087 |
self.assertEqual('append/a/b/c', |
|
1088 |
self.my_config.get_user_option('appendpath_option')) |
|
1089 |
# Overriden for http://www.example.com/dir, where it is a
|
|
1090 |
# normal option:
|
|
1091 |
self.get_branch_config('http://www.example.com/dir/a/b/c') |
|
1092 |
self.assertEqual('normal', |
|
1093 |
self.my_config.get_user_option('appendpath_option')) |
|
1094 |
||
1095 |
def test_get_user_option_norecurse(self): |
|
1096 |
self.get_branch_config('http://www.example.com') |
|
1097 |
self.assertEqual('norecurse', |
|
1098 |
self.my_config.get_user_option('norecurse_option')) |
|
1099 |
self.get_branch_config('http://www.example.com/dir') |
|
1100 |
self.assertEqual(None, |
|
1101 |
self.my_config.get_user_option('norecurse_option')) |
|
1102 |
# http://www.example.com/norecurse is a recurse=False section
|
|
1103 |
# that redefines normal_option. Subdirectories do not pick up
|
|
1104 |
# this redefinition.
|
|
1105 |
self.get_branch_config('http://www.example.com/norecurse') |
|
1106 |
self.assertEqual('norecurse', |
|
1107 |
self.my_config.get_user_option('normal_option')) |
|
1108 |
self.get_branch_config('http://www.example.com/norecurse/subdir') |
|
1109 |
self.assertEqual('normal', |
|
1110 |
self.my_config.get_user_option('normal_option')) |
|
1111 |
||
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
1112 |
def test_set_user_option_norecurse(self): |
1113 |
self.get_branch_config('http://www.example.com') |
|
1114 |
self.my_config.set_user_option('foo', 'bar', |
|
1115 |
store=config.STORE_LOCATION_NORECURSE) |
|
1116 |
self.assertEqual( |
|
1117 |
self.my_location_config._get_option_policy( |
|
1118 |
'http://www.example.com', 'foo'), |
|
1119 |
config.POLICY_NORECURSE) |
|
1120 |
||
1121 |
def test_set_user_option_appendpath(self): |
|
1122 |
self.get_branch_config('http://www.example.com') |
|
1123 |
self.my_config.set_user_option('foo', 'bar', |
|
1124 |
store=config.STORE_LOCATION_APPENDPATH) |
|
1125 |
self.assertEqual( |
|
1126 |
self.my_location_config._get_option_policy( |
|
1127 |
'http://www.example.com', 'foo'), |
|
1128 |
config.POLICY_APPENDPATH) |
|
1129 |
||
1130 |
def test_set_user_option_change_policy(self): |
|
1131 |
self.get_branch_config('http://www.example.com') |
|
1132 |
self.my_config.set_user_option('norecurse_option', 'normal', |
|
1133 |
store=config.STORE_LOCATION) |
|
1134 |
self.assertEqual( |
|
1135 |
self.my_location_config._get_option_policy( |
|
1136 |
'http://www.example.com', 'norecurse_option'), |
|
1137 |
config.POLICY_NONE) |
|
1138 |
||
1139 |
def test_set_user_option_recurse_false_section(self): |
|
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
1140 |
# The following section has recurse=False set. The test is to
|
1141 |
# make sure that a normal option can be added to the section,
|
|
1142 |
# converting recurse=False to the norecurse policy.
|
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
1143 |
self.get_branch_config('http://www.example.com/norecurse') |
2120.6.11
by James Henstridge
s/0.13/0.14/ in deprecation warning |
1144 |
self.callDeprecated(['The recurse option is deprecated as of 0.14. ' |
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
1145 |
'The section "http://www.example.com/norecurse" '
|
1146 |
'has been converted to use policies.'], |
|
1147 |
self.my_config.set_user_option, |
|
1148 |
'foo', 'bar', store=config.STORE_LOCATION) |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
1149 |
self.assertEqual( |
1150 |
self.my_location_config._get_option_policy( |
|
1151 |
'http://www.example.com/norecurse', 'foo'), |
|
1152 |
config.POLICY_NONE) |
|
1153 |
# The previously existing option is still norecurse:
|
|
1154 |
self.assertEqual( |
|
1155 |
self.my_location_config._get_option_policy( |
|
1156 |
'http://www.example.com/norecurse', 'normal_option'), |
|
1157 |
config.POLICY_NORECURSE) |
|
1158 |
||
1472
by Robert Collins
post commit hook, first pass implementation |
1159 |
def test_post_commit_default(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1160 |
self.get_branch_config('/a/c') |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1161 |
self.assertEqual('bzrlib.tests.test_config.post_commit', |
1472
by Robert Collins
post commit hook, first pass implementation |
1162 |
self.my_config.post_commit()) |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
1163 |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1164 |
def get_branch_config(self, location, global_config=None): |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1165 |
my_branch = FakeBranch(location) |
1502
by Robert Collins
Bugfix the config test suite to not create .bazaar in the dir where it is run. |
1166 |
if global_config is None: |
5345.2.2
by Vincent Ladeuil
Simplify test config building. |
1167 |
global_config = sample_config_text |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1168 |
|
5345.1.26
by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts |
1169 |
my_global_config = config.GlobalConfig.from_string(global_config, |
1170 |
save=True) |
|
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
1171 |
my_location_config = config.LocationConfig.from_string( |
5345.1.25
by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts. |
1172 |
sample_branches_text, my_branch.base, save=True) |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1173 |
my_config = config.BranchConfig(my_branch) |
1174 |
self.my_config = my_config |
|
1175 |
self.my_location_config = my_config._get_location_config() |
|
1502
by Robert Collins
Bugfix the config test suite to not create .bazaar in the dir where it is run. |
1176 |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1177 |
def test_set_user_setting_sets_and_saves(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1178 |
self.get_branch_config('/a/c') |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1179 |
record = InstrumentedConfigObj("foo") |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1180 |
self.my_location_config._parser = record |
1185.62.6
by John Arbash Meinel
Updated test_set_user_setting_sets_and_saves to remove the print statement, and make sure it is doing the right thing |
1181 |
|
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1182 |
self.callDeprecated(['The recurse option is deprecated as of ' |
1183 |
'0.14. The section "/a/c" has been '
|
|
1184 |
'converted to use policies.'], |
|
1185 |
self.my_config.set_user_option, |
|
1186 |
'foo', 'bar', store=config.STORE_LOCATION) |
|
5345.1.8
by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts. |
1187 |
self.assertEqual([('reload',), |
1188 |
('__contains__', '/a/c'), |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1189 |
('__contains__', '/a/c/'), |
1190 |
('__setitem__', '/a/c', {}), |
|
1191 |
('__getitem__', '/a/c'), |
|
1192 |
('__setitem__', 'foo', 'bar'), |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
1193 |
('__getitem__', '/a/c'), |
1194 |
('as_bool', 'recurse'), |
|
1195 |
('__getitem__', '/a/c'), |
|
1196 |
('__delitem__', 'recurse'), |
|
1197 |
('__getitem__', '/a/c'), |
|
1198 |
('keys',), |
|
2120.6.8
by James Henstridge
Change syntax for setting config option policies. Rather than |
1199 |
('__getitem__', '/a/c'), |
1200 |
('__contains__', 'foo:policy'), |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1201 |
('write',)], |
1202 |
record._calls[1:]) |
|
1203 |
||
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1204 |
def test_set_user_setting_sets_and_saves2(self): |
1205 |
self.get_branch_config('/a/c') |
|
1206 |
self.assertIs(self.my_config.get_user_option('foo'), None) |
|
1207 |
self.my_config.set_user_option('foo', 'bar') |
|
1208 |
self.assertEqual( |
|
3616.2.6
by Mark Hammond
Fix test_set_user_setting_sets_and_saves2 on windows by stripping EOL |
1209 |
self.my_config.branch.control_files.files['branch.conf'].strip(), |
1210 |
'foo = bar') |
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1211 |
self.assertEqual(self.my_config.get_user_option('foo'), 'bar') |
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
1212 |
self.my_config.set_user_option('foo', 'baz', |
1213 |
store=config.STORE_LOCATION) |
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1214 |
self.assertEqual(self.my_config.get_user_option('foo'), 'baz') |
1215 |
self.my_config.set_user_option('foo', 'qux') |
|
1216 |
self.assertEqual(self.my_config.get_user_option('foo'), 'baz') |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1217 |
|
1551.18.17
by Aaron Bentley
Introduce bzr_remote_path configuration variable |
1218 |
def test_get_bzr_remote_path(self): |
1219 |
my_config = config.LocationConfig('/a/c') |
|
1220 |
self.assertEqual('bzr', my_config.get_bzr_remote_path()) |
|
1221 |
my_config.set_user_option('bzr_remote_path', '/path-bzr') |
|
1222 |
self.assertEqual('/path-bzr', my_config.get_bzr_remote_path()) |
|
1223 |
os.environ['BZR_REMOTE_PATH'] = '/environ-bzr' |
|
1224 |
self.assertEqual('/environ-bzr', my_config.get_bzr_remote_path()) |
|
1225 |
||
1185.62.7
by John Arbash Meinel
Whitespace cleanup. |
1226 |
|
1770.2.8
by Aaron Bentley
Add precedence test |
1227 |
precedence_global = 'option = global' |
1228 |
precedence_branch = 'option = branch' |
|
1229 |
precedence_location = """ |
|
1230 |
[http://]
|
|
1231 |
recurse = true
|
|
1232 |
option = recurse
|
|
1233 |
[http://example.com/specific]
|
|
1234 |
option = exact
|
|
1235 |
"""
|
|
1236 |
||
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
1237 |
class TestBranchConfigItems(tests.TestCaseInTempDir): |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
1238 |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1239 |
def get_branch_config(self, global_config=None, location=None, |
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1240 |
location_config=None, branch_data_config=None): |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1241 |
my_branch = FakeBranch(location) |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1242 |
if global_config is not None: |
5345.1.26
by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts |
1243 |
my_global_config = config.GlobalConfig.from_string(global_config, |
1244 |
save=True) |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1245 |
if location_config is not None: |
5345.2.9
by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string. |
1246 |
my_location_config = config.LocationConfig.from_string( |
5345.1.25
by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts. |
1247 |
location_config, my_branch.base, save=True) |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1248 |
my_config = config.BranchConfig(my_branch) |
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1249 |
if branch_data_config is not None: |
1250 |
my_config.branch.control_files.files['branch.conf'] = \ |
|
1251 |
branch_data_config
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1252 |
return my_config |
1253 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
1254 |
def test_user_id(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1255 |
branch = FakeBranch(user_id='Robert Collins <robertc@example.net>') |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
1256 |
my_config = config.BranchConfig(branch) |
1257 |
self.assertEqual("Robert Collins <robertc@example.net>", |
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1258 |
my_config.username()) |
3388.2.3
by Martin Pool
Fix up more uses of LockableFiles.get_utf8 in tests |
1259 |
my_config.branch.control_files.files['email'] = "John" |
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1260 |
my_config.set_user_option('email', |
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1261 |
"Robert Collins <robertc@example.org>") |
1262 |
self.assertEqual("John", my_config.username()) |
|
3388.2.3
by Martin Pool
Fix up more uses of LockableFiles.get_utf8 in tests |
1263 |
del my_config.branch.control_files.files['email'] |
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1264 |
self.assertEqual("Robert Collins <robertc@example.org>", |
1265 |
my_config.username()) |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
1266 |
|
1267 |
def test_not_set_in_branch(self): |
|
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1268 |
my_config = self.get_branch_config(global_config=sample_config_text) |
1551.2.21
by Aaron Bentley
Formatted unicode config tests as ASCII |
1269 |
self.assertEqual(u"Erik B\u00e5gfors <erik@bagfors.nu>", |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
1270 |
my_config._get_user_id()) |
3388.2.3
by Martin Pool
Fix up more uses of LockableFiles.get_utf8 in tests |
1271 |
my_config.branch.control_files.files['email'] = "John" |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
1272 |
self.assertEqual("John", my_config._get_user_id()) |
1273 |
||
1861.4.1
by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL. |
1274 |
def test_BZR_EMAIL_OVERRIDES(self): |
1275 |
os.environ['BZR_EMAIL'] = "Robert Collins <robertc@example.org>" |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
1276 |
branch = FakeBranch() |
1277 |
my_config = config.BranchConfig(branch) |
|
1278 |
self.assertEqual("Robert Collins <robertc@example.org>", |
|
1279 |
my_config.username()) |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1280 |
|
1442.1.19
by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig. |
1281 |
def test_signatures_forced(self): |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1282 |
my_config = self.get_branch_config( |
1283 |
global_config=sample_always_signatures) |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
1284 |
self.assertEqual(config.CHECK_NEVER, my_config.signature_checking()) |
1285 |
self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy()) |
|
1286 |
self.assertTrue(my_config.signature_needed()) |
|
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
1287 |
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1288 |
def test_signatures_forced_branch(self): |
1289 |
my_config = self.get_branch_config( |
|
1290 |
global_config=sample_ignore_signatures, |
|
1291 |
branch_data_config=sample_always_signatures) |
|
1292 |
self.assertEqual(config.CHECK_NEVER, my_config.signature_checking()) |
|
1293 |
self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy()) |
|
1294 |
self.assertTrue(my_config.signature_needed()) |
|
1295 |
||
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
1296 |
def test_gpg_signing_command(self): |
1770.2.10
by Aaron Bentley
Added test that branch_config can't influence gpg_signing_command |
1297 |
my_config = self.get_branch_config( |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1298 |
global_config=sample_config_text, |
1770.2.10
by Aaron Bentley
Added test that branch_config can't influence gpg_signing_command |
1299 |
# branch data cannot set gpg_signing_command
|
1300 |
branch_data_config="gpg_signing_command=pgp") |
|
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
1301 |
self.assertEqual('gnome-gpg', my_config.gpg_signing_command()) |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
1302 |
|
1303 |
def test_get_user_option_global(self): |
|
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1304 |
my_config = self.get_branch_config(global_config=sample_config_text) |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
1305 |
self.assertEqual('something', |
1306 |
my_config.get_user_option('user_global_option')) |
|
1472
by Robert Collins
post commit hook, first pass implementation |
1307 |
|
1308 |
def test_post_commit_default(self): |
|
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1309 |
my_config = self.get_branch_config(global_config=sample_config_text, |
1310 |
location='/a/c', |
|
1311 |
location_config=sample_branches_text) |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
1312 |
self.assertEqual(my_config.branch.base, '/a/c') |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1313 |
self.assertEqual('bzrlib.tests.test_config.post_commit', |
1472
by Robert Collins
post commit hook, first pass implementation |
1314 |
my_config.post_commit()) |
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1315 |
my_config.set_user_option('post_commit', 'rmtree_root') |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1316 |
# post-commit is ignored when present in branch data
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1317 |
self.assertEqual('bzrlib.tests.test_config.post_commit', |
1318 |
my_config.post_commit()) |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
1319 |
my_config.set_user_option('post_commit', 'rmtree_root', |
1320 |
store=config.STORE_LOCATION) |
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
1321 |
self.assertEqual('rmtree_root', my_config.post_commit()) |
1185.33.31
by Martin Pool
Make annotate cope better with revisions committed without a valid |
1322 |
|
1770.2.8
by Aaron Bentley
Add precedence test |
1323 |
def test_config_precedence(self): |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1324 |
# FIXME: eager test, luckily no persitent config file makes it fail
|
1325 |
# -- vila 20100716
|
|
1770.2.8
by Aaron Bentley
Add precedence test |
1326 |
my_config = self.get_branch_config(global_config=precedence_global) |
1327 |
self.assertEqual(my_config.get_user_option('option'), 'global') |
|
2991.2.2
by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0. |
1328 |
my_config = self.get_branch_config(global_config=precedence_global, |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1329 |
branch_data_config=precedence_branch) |
1770.2.8
by Aaron Bentley
Add precedence test |
1330 |
self.assertEqual(my_config.get_user_option('option'), 'branch') |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1331 |
my_config = self.get_branch_config( |
1332 |
global_config=precedence_global, |
|
1333 |
branch_data_config=precedence_branch, |
|
1334 |
location_config=precedence_location) |
|
1770.2.8
by Aaron Bentley
Add precedence test |
1335 |
self.assertEqual(my_config.get_user_option('option'), 'recurse') |
5345.1.5
by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light. |
1336 |
my_config = self.get_branch_config( |
1337 |
global_config=precedence_global, |
|
1338 |
branch_data_config=precedence_branch, |
|
1339 |
location_config=precedence_location, |
|
1340 |
location='http://example.com/specific') |
|
1770.2.8
by Aaron Bentley
Add precedence test |
1341 |
self.assertEqual(my_config.get_user_option('option'), 'exact') |
1342 |
||
2681.1.8
by Aaron Bentley
Add Thunderbird support to bzr send |
1343 |
def test_get_mail_client(self): |
1344 |
config = self.get_branch_config() |
|
1345 |
client = config.get_mail_client() |
|
2681.1.24
by Aaron Bentley
Handle default mail client by trying xdg-email, falling back to editor |
1346 |
self.assertIsInstance(client, mail_client.DefaultMail) |
1347 |
||
2790.2.2
by Keir Mierle
Change alphabetic ordering into two categories; one for specific clients the other for generic options. |
1348 |
# Specific clients
|
2681.1.21
by Aaron Bentley
Refactor prompt generation to make it testable, test it with unicode |
1349 |
config.set_user_option('mail_client', 'evolution') |
1350 |
client = config.get_mail_client() |
|
1351 |
self.assertIsInstance(client, mail_client.Evolution) |
|
1352 |
||
2681.5.1
by ghigo
Add KMail support to bzr send |
1353 |
config.set_user_option('mail_client', 'kmail') |
1354 |
client = config.get_mail_client() |
|
1355 |
self.assertIsInstance(client, mail_client.KMail) |
|
1356 |
||
2790.2.1
by Keir Mierle
Add Mutt as a supported client email program. Also rearranges various listings |
1357 |
config.set_user_option('mail_client', 'mutt') |
1358 |
client = config.get_mail_client() |
|
1359 |
self.assertIsInstance(client, mail_client.Mutt) |
|
1360 |
||
1361 |
config.set_user_option('mail_client', 'thunderbird') |
|
1362 |
client = config.get_mail_client() |
|
1363 |
self.assertIsInstance(client, mail_client.Thunderbird) |
|
1364 |
||
2790.2.2
by Keir Mierle
Change alphabetic ordering into two categories; one for specific clients the other for generic options. |
1365 |
# Generic options
|
1366 |
config.set_user_option('mail_client', 'default') |
|
1367 |
client = config.get_mail_client() |
|
1368 |
self.assertIsInstance(client, mail_client.DefaultMail) |
|
1369 |
||
1370 |
config.set_user_option('mail_client', 'editor') |
|
1371 |
client = config.get_mail_client() |
|
1372 |
self.assertIsInstance(client, mail_client.Editor) |
|
1373 |
||
1374 |
config.set_user_option('mail_client', 'mapi') |
|
1375 |
client = config.get_mail_client() |
|
1376 |
self.assertIsInstance(client, mail_client.MAPIClient) |
|
1377 |
||
2681.1.23
by Aaron Bentley
Add support for xdg-email |
1378 |
config.set_user_option('mail_client', 'xdg-email') |
1379 |
client = config.get_mail_client() |
|
1380 |
self.assertIsInstance(client, mail_client.XDGEmail) |
|
1381 |
||
2681.1.10
by Aaron Bentley
Clean up handling of unknown mail clients |
1382 |
config.set_user_option('mail_client', 'firebird') |
1383 |
self.assertRaises(errors.UnknownMailClient, config.get_mail_client) |
|
1384 |
||
1185.33.31
by Martin Pool
Make annotate cope better with revisions committed without a valid |
1385 |
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
1386 |
class TestMailAddressExtraction(tests.TestCase): |
1185.33.31
by Martin Pool
Make annotate cope better with revisions committed without a valid |
1387 |
|
1388 |
def test_extract_email_address(self): |
|
1389 |
self.assertEqual('jane@test.com', |
|
1390 |
config.extract_email_address('Jane <jane@test.com>')) |
|
2055.2.2
by John Arbash Meinel
Switch extract_email_address() to use a more specific exception |
1391 |
self.assertRaises(errors.NoEmailInUsername, |
1185.33.31
by Martin Pool
Make annotate cope better with revisions committed without a valid |
1392 |
config.extract_email_address, 'Jane Tester') |
2533.1.1
by James Westby
Fix TreeConfig to return values from sections. |
1393 |
|
3063.3.2
by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username. |
1394 |
def test_parse_username(self): |
1395 |
self.assertEqual(('', 'jdoe@example.com'), |
|
1396 |
config.parse_username('jdoe@example.com')) |
|
1397 |
self.assertEqual(('', 'jdoe@example.com'), |
|
1398 |
config.parse_username('<jdoe@example.com>')) |
|
1399 |
self.assertEqual(('John Doe', 'jdoe@example.com'), |
|
1400 |
config.parse_username('John Doe <jdoe@example.com>')) |
|
1401 |
self.assertEqual(('John Doe', ''), |
|
1402 |
config.parse_username('John Doe')) |
|
3063.3.3
by Lukáš Lalinský
Add one more test for config.parse_username(). |
1403 |
self.assertEqual(('John Doe', 'jdoe@example.com'), |
1404 |
config.parse_username('John Doe jdoe@example.com')) |
|
2562.1.2
by John Arbash Meinel
Clean up whitespace |
1405 |
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
1406 |
class TestTreeConfig(tests.TestCaseWithTransport): |
2533.1.1
by James Westby
Fix TreeConfig to return values from sections. |
1407 |
|
1408 |
def test_get_value(self): |
|
1409 |
"""Test that retreiving a value from a section is possible"""
|
|
1410 |
branch = self.make_branch('.') |
|
1411 |
tree_config = config.TreeConfig(branch) |
|
1412 |
tree_config.set_option('value', 'key', 'SECTION') |
|
1413 |
tree_config.set_option('value2', 'key2') |
|
1414 |
tree_config.set_option('value3-top', 'key3') |
|
1415 |
tree_config.set_option('value3-section', 'key3', 'SECTION') |
|
1416 |
value = tree_config.get_option('key', 'SECTION') |
|
1417 |
self.assertEqual(value, 'value') |
|
1418 |
value = tree_config.get_option('key2') |
|
1419 |
self.assertEqual(value, 'value2') |
|
1420 |
self.assertEqual(tree_config.get_option('non-existant'), None) |
|
1421 |
value = tree_config.get_option('non-existant', 'SECTION') |
|
1422 |
self.assertEqual(value, None) |
|
1423 |
value = tree_config.get_option('non-existant', default='default') |
|
1424 |
self.assertEqual(value, 'default') |
|
1425 |
self.assertEqual(tree_config.get_option('key2', 'NOSECTION'), None) |
|
1426 |
value = tree_config.get_option('key2', 'NOSECTION', default='default') |
|
1427 |
self.assertEqual(value, 'default') |
|
1428 |
value = tree_config.get_option('key3') |
|
1429 |
self.assertEqual(value, 'value3-top') |
|
1430 |
value = tree_config.get_option('key3', 'SECTION') |
|
1431 |
self.assertEqual(value, 'value3-section') |
|
2900.2.3
by Vincent Ladeuil
Credentials matching implementation. |
1432 |
|
1433 |
||
3242.1.2
by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication |
1434 |
class TestTransportConfig(tests.TestCaseWithTransport): |
3242.1.1
by Aaron Bentley
Implement BzrDir configuration |
1435 |
|
1436 |
def test_get_value(self): |
|
1437 |
"""Test that retreiving a value from a section is possible"""
|
|
3242.1.2
by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication |
1438 |
bzrdir_config = config.TransportConfig(transport.get_transport('.'), |
1439 |
'control.conf') |
|
3242.1.1
by Aaron Bentley
Implement BzrDir configuration |
1440 |
bzrdir_config.set_option('value', 'key', 'SECTION') |
1441 |
bzrdir_config.set_option('value2', 'key2') |
|
1442 |
bzrdir_config.set_option('value3-top', 'key3') |
|
1443 |
bzrdir_config.set_option('value3-section', 'key3', 'SECTION') |
|
1444 |
value = bzrdir_config.get_option('key', 'SECTION') |
|
1445 |
self.assertEqual(value, 'value') |
|
1446 |
value = bzrdir_config.get_option('key2') |
|
1447 |
self.assertEqual(value, 'value2') |
|
1448 |
self.assertEqual(bzrdir_config.get_option('non-existant'), None) |
|
1449 |
value = bzrdir_config.get_option('non-existant', 'SECTION') |
|
1450 |
self.assertEqual(value, None) |
|
1451 |
value = bzrdir_config.get_option('non-existant', default='default') |
|
1452 |
self.assertEqual(value, 'default') |
|
1453 |
self.assertEqual(bzrdir_config.get_option('key2', 'NOSECTION'), None) |
|
1454 |
value = bzrdir_config.get_option('key2', 'NOSECTION', |
|
1455 |
default='default') |
|
1456 |
self.assertEqual(value, 'default') |
|
1457 |
value = bzrdir_config.get_option('key3') |
|
1458 |
self.assertEqual(value, 'value3-top') |
|
1459 |
value = bzrdir_config.get_option('key3', 'SECTION') |
|
1460 |
self.assertEqual(value, 'value3-section') |
|
1461 |
||
3242.3.11
by Aaron Bentley
Clean up BzrDirConfig usage |
1462 |
def test_set_unset_default_stack_on(self): |
1463 |
my_dir = self.make_bzrdir('.') |
|
4288.1.3
by Robert Collins
Fix BzrDirConfig tests. |
1464 |
bzrdir_config = config.BzrDirConfig(my_dir) |
3242.3.11
by Aaron Bentley
Clean up BzrDirConfig usage |
1465 |
self.assertIs(None, bzrdir_config.get_default_stack_on()) |
1466 |
bzrdir_config.set_default_stack_on('Foo') |
|
3242.3.14
by Aaron Bentley
Make BzrDirConfig use TransportConfig |
1467 |
self.assertEqual('Foo', bzrdir_config._config.get_option( |
1468 |
'default_stack_on')) |
|
3242.3.11
by Aaron Bentley
Clean up BzrDirConfig usage |
1469 |
self.assertEqual('Foo', bzrdir_config.get_default_stack_on()) |
1470 |
bzrdir_config.set_default_stack_on(None) |
|
1471 |
self.assertIs(None, bzrdir_config.get_default_stack_on()) |
|
1472 |
||
3242.1.1
by Aaron Bentley
Implement BzrDir configuration |
1473 |
|
2900.2.5
by Vincent Ladeuil
ake ftp aware of authentication config. |
1474 |
class TestAuthenticationConfigFile(tests.TestCase): |
2900.2.14
by Vincent Ladeuil
More tests. |
1475 |
"""Test the authentication.conf file matching"""
|
2900.2.3
by Vincent Ladeuil
Credentials matching implementation. |
1476 |
|
1477 |
def _got_user_passwd(self, expected_user, expected_password, |
|
1478 |
config, *args, **kwargs): |
|
1479 |
credentials = config.get_credentials(*args, **kwargs) |
|
1480 |
if credentials is None: |
|
1481 |
user = None |
|
1482 |
password = None |
|
1483 |
else: |
|
1484 |
user = credentials['user'] |
|
1485 |
password = credentials['password'] |
|
1486 |
self.assertEquals(expected_user, user) |
|
1487 |
self.assertEquals(expected_password, password) |
|
1488 |
||
2978.5.1
by John Arbash Meinel
Fix bug #162494, 'bzr register-branch' needs proper auth handling. |
1489 |
def test_empty_config(self): |
2900.2.3
by Vincent Ladeuil
Credentials matching implementation. |
1490 |
conf = config.AuthenticationConfig(_file=StringIO()) |
1491 |
self.assertEquals({}, conf._get_config()) |
|
1492 |
self._got_user_passwd(None, None, conf, 'http', 'foo.net') |
|
1493 |
||
3418.2.1
by Vincent Ladeuil
Fix #217650 by catching declarations outside sections. |
1494 |
def test_missing_auth_section_header(self): |
1495 |
conf = config.AuthenticationConfig(_file=StringIO('foo = bar')) |
|
1496 |
self.assertRaises(ValueError, conf.get_credentials, 'ftp', 'foo.net') |
|
1497 |
||
1498 |
def test_auth_section_header_not_closed(self): |
|
2900.2.3
by Vincent Ladeuil
Credentials matching implementation. |
1499 |
conf = config.AuthenticationConfig(_file=StringIO('[DEF')) |
1500 |
self.assertRaises(errors.ParseConfigError, conf._get_config) |
|
2900.2.15
by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step). |
1501 |
|
3418.2.1
by Vincent Ladeuil
Fix #217650 by catching declarations outside sections. |
1502 |
def test_auth_value_not_boolean(self): |
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
1503 |
conf = config.AuthenticationConfig(_file=StringIO( |
1504 |
"""[broken]
|
|
1505 |
scheme=ftp
|
|
1506 |
user=joe
|
|
2900.2.15
by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step). |
1507 |
verify_certificates=askme # Error: Not a boolean
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
1508 |
""")) |
1509 |
self.assertRaises(ValueError, conf.get_credentials, 'ftp', 'foo.net') |
|
3418.2.1
by Vincent Ladeuil
Fix #217650 by catching declarations outside sections. |
1510 |
|
1511 |
def test_auth_value_not_int(self): |
|
2900.2.22
by Vincent Ladeuil
Polishing. |
1512 |
conf = config.AuthenticationConfig(_file=StringIO( |
1513 |
"""[broken]
|
|
1514 |
scheme=ftp
|
|
1515 |
user=joe
|
|
1516 |
port=port # Error: Not an int
|
|
1517 |
""")) |
|
1518 |
self.assertRaises(ValueError, conf.get_credentials, 'ftp', 'foo.net') |
|
2900.2.3
by Vincent Ladeuil
Credentials matching implementation. |
1519 |
|
3757.3.1
by Vincent Ladeuil
Add credential stores plugging. |
1520 |
def test_unknown_password_encoding(self): |
1521 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1522 |
"""[broken]
|
|
1523 |
scheme=ftp
|
|
1524 |
user=joe
|
|
1525 |
password_encoding=unknown
|
|
1526 |
""")) |
|
1527 |
self.assertRaises(ValueError, conf.get_password, |
|
1528 |
'ftp', 'foo.net', 'joe') |
|
1529 |
||
2900.2.3
by Vincent Ladeuil
Credentials matching implementation. |
1530 |
def test_credentials_for_scheme_host(self): |
1531 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1532 |
"""# Identity on foo.net
|
|
1533 |
[ftp definition]
|
|
1534 |
scheme=ftp
|
|
1535 |
host=foo.net
|
|
1536 |
user=joe
|
|
1537 |
password=secret-pass
|
|
1538 |
""")) |
|
1539 |
# Basic matching
|
|
1540 |
self._got_user_passwd('joe', 'secret-pass', conf, 'ftp', 'foo.net') |
|
1541 |
# different scheme
|
|
1542 |
self._got_user_passwd(None, None, conf, 'http', 'foo.net') |
|
1543 |
# different host
|
|
1544 |
self._got_user_passwd(None, None, conf, 'ftp', 'bar.net') |
|
1545 |
||
1546 |
def test_credentials_for_host_port(self): |
|
1547 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1548 |
"""# Identity on foo.net
|
|
1549 |
[ftp definition]
|
|
1550 |
scheme=ftp
|
|
1551 |
port=10021
|
|
1552 |
host=foo.net
|
|
1553 |
user=joe
|
|
1554 |
password=secret-pass
|
|
1555 |
""")) |
|
1556 |
# No port
|
|
1557 |
self._got_user_passwd('joe', 'secret-pass', |
|
1558 |
conf, 'ftp', 'foo.net', port=10021) |
|
1559 |
# different port
|
|
1560 |
self._got_user_passwd(None, None, conf, 'ftp', 'foo.net') |
|
1561 |
||
1562 |
def test_for_matching_host(self): |
|
1563 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1564 |
"""# Identity on foo.net
|
|
1565 |
[sourceforge]
|
|
1566 |
scheme=bzr
|
|
1567 |
host=bzr.sf.net
|
|
1568 |
user=joe
|
|
1569 |
password=joepass
|
|
1570 |
[sourceforge domain]
|
|
1571 |
scheme=bzr
|
|
1572 |
host=.bzr.sf.net
|
|
1573 |
user=georges
|
|
1574 |
password=bendover
|
|
1575 |
""")) |
|
1576 |
# matching domain
|
|
1577 |
self._got_user_passwd('georges', 'bendover', |
|
1578 |
conf, 'bzr', 'foo.bzr.sf.net') |
|
1579 |
# phishing attempt
|
|
1580 |
self._got_user_passwd(None, None, |
|
1581 |
conf, 'bzr', 'bbzr.sf.net') |
|
1582 |
||
1583 |
def test_for_matching_host_None(self): |
|
1584 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1585 |
"""# Identity on foo.net
|
|
1586 |
[catchup bzr]
|
|
1587 |
scheme=bzr
|
|
1588 |
user=joe
|
|
1589 |
password=joepass
|
|
1590 |
[DEFAULT]
|
|
1591 |
user=georges
|
|
1592 |
password=bendover
|
|
1593 |
""")) |
|
1594 |
# match no host
|
|
1595 |
self._got_user_passwd('joe', 'joepass', |
|
1596 |
conf, 'bzr', 'quux.net') |
|
1597 |
# no host but different scheme
|
|
1598 |
self._got_user_passwd('georges', 'bendover', |
|
1599 |
conf, 'ftp', 'quux.net') |
|
1600 |
||
1601 |
def test_credentials_for_path(self): |
|
1602 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1603 |
"""
|
|
1604 |
[http dir1]
|
|
1605 |
scheme=http
|
|
1606 |
host=bar.org
|
|
1607 |
path=/dir1
|
|
1608 |
user=jim
|
|
1609 |
password=jimpass
|
|
1610 |
[http dir2]
|
|
1611 |
scheme=http
|
|
1612 |
host=bar.org
|
|
1613 |
path=/dir2
|
|
1614 |
user=georges
|
|
1615 |
password=bendover
|
|
1616 |
""")) |
|
1617 |
# no path no dice
|
|
1618 |
self._got_user_passwd(None, None, |
|
1619 |
conf, 'http', host='bar.org', path='/dir3') |
|
1620 |
# matching path
|
|
1621 |
self._got_user_passwd('georges', 'bendover', |
|
1622 |
conf, 'http', host='bar.org', path='/dir2') |
|
1623 |
# matching subdir
|
|
1624 |
self._got_user_passwd('jim', 'jimpass', |
|
1625 |
conf, 'http', host='bar.org',path='/dir1/subdir') |
|
1626 |
||
1627 |
def test_credentials_for_user(self): |
|
1628 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1629 |
"""
|
|
1630 |
[with user]
|
|
1631 |
scheme=http
|
|
1632 |
host=bar.org
|
|
1633 |
user=jim
|
|
1634 |
password=jimpass
|
|
1635 |
""")) |
|
1636 |
# Get user
|
|
1637 |
self._got_user_passwd('jim', 'jimpass', |
|
1638 |
conf, 'http', 'bar.org') |
|
1639 |
# Get same user
|
|
1640 |
self._got_user_passwd('jim', 'jimpass', |
|
1641 |
conf, 'http', 'bar.org', user='jim') |
|
1642 |
# Don't get a different user if one is specified
|
|
1643 |
self._got_user_passwd(None, None, |
|
1644 |
conf, 'http', 'bar.org', user='georges') |
|
1645 |
||
3418.4.1
by Vincent Ladeuil
Reproduce bug 199440. |
1646 |
def test_credentials_for_user_without_password(self): |
1647 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1648 |
"""
|
|
1649 |
[without password]
|
|
1650 |
scheme=http
|
|
1651 |
host=bar.org
|
|
1652 |
user=jim
|
|
1653 |
""")) |
|
1654 |
# Get user but no password
|
|
1655 |
self._got_user_passwd('jim', None, |
|
1656 |
conf, 'http', 'bar.org') |
|
1657 |
||
2900.2.3
by Vincent Ladeuil
Credentials matching implementation. |
1658 |
def test_verify_certificates(self): |
1659 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1660 |
"""
|
|
1661 |
[self-signed]
|
|
1662 |
scheme=https
|
|
1663 |
host=bar.org
|
|
1664 |
user=jim
|
|
1665 |
password=jimpass
|
|
1666 |
verify_certificates=False
|
|
1667 |
[normal]
|
|
1668 |
scheme=https
|
|
1669 |
host=foo.net
|
|
1670 |
user=georges
|
|
1671 |
password=bendover
|
|
1672 |
""")) |
|
1673 |
credentials = conf.get_credentials('https', 'bar.org') |
|
1674 |
self.assertEquals(False, credentials.get('verify_certificates')) |
|
1675 |
credentials = conf.get_credentials('https', 'foo.net') |
|
1676 |
self.assertEquals(True, credentials.get('verify_certificates')) |
|
2900.2.4
by Vincent Ladeuil
Cosmetic changes. |
1677 |
|
3777.1.10
by Aaron Bentley
Ensure credentials are stored |
1678 |
|
1679 |
class TestAuthenticationStorage(tests.TestCaseInTempDir): |
|
1680 |
||
3777.1.8
by Aaron Bentley
Commit work-in-progress |
1681 |
def test_set_credentials(self): |
3777.1.10
by Aaron Bentley
Ensure credentials are stored |
1682 |
conf = config.AuthenticationConfig() |
3777.3.2
by Aaron Bentley
Reverse order of scheme and password |
1683 |
conf.set_credentials('name', 'host', 'user', 'scheme', 'password', |
4081.1.1
by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials |
1684 |
99, path='/foo', verify_certificates=False, realm='realm') |
3777.1.8
by Aaron Bentley
Commit work-in-progress |
1685 |
credentials = conf.get_credentials(host='host', scheme='scheme', |
4081.1.1
by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials |
1686 |
port=99, path='/foo', |
1687 |
realm='realm') |
|
3777.1.10
by Aaron Bentley
Ensure credentials are stored |
1688 |
CREDENTIALS = {'name': 'name', 'user': 'user', 'password': 'password', |
4107.1.8
by Jean-Francois Roy
Updated test_config to account for the new credentials keys. |
1689 |
'verify_certificates': False, 'scheme': 'scheme', |
1690 |
'host': 'host', 'port': 99, 'path': '/foo', |
|
1691 |
'realm': 'realm'} |
|
3777.1.10
by Aaron Bentley
Ensure credentials are stored |
1692 |
self.assertEqual(CREDENTIALS, credentials) |
1693 |
credentials_from_disk = config.AuthenticationConfig().get_credentials( |
|
4081.1.1
by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials |
1694 |
host='host', scheme='scheme', port=99, path='/foo', realm='realm') |
3777.1.10
by Aaron Bentley
Ensure credentials are stored |
1695 |
self.assertEqual(CREDENTIALS, credentials_from_disk) |
3777.1.8
by Aaron Bentley
Commit work-in-progress |
1696 |
|
3777.1.11
by Aaron Bentley
Ensure changed-name updates clear old values |
1697 |
def test_reset_credentials_different_name(self): |
1698 |
conf = config.AuthenticationConfig() |
|
3777.3.2
by Aaron Bentley
Reverse order of scheme and password |
1699 |
conf.set_credentials('name', 'host', 'user', 'scheme', 'password'), |
1700 |
conf.set_credentials('name2', 'host', 'user2', 'scheme', 'password'), |
|
3777.1.11
by Aaron Bentley
Ensure changed-name updates clear old values |
1701 |
self.assertIs(None, conf._get_config().get('name')) |
1702 |
credentials = conf.get_credentials(host='host', scheme='scheme') |
|
1703 |
CREDENTIALS = {'name': 'name2', 'user': 'user2', 'password': |
|
4107.1.8
by Jean-Francois Roy
Updated test_config to account for the new credentials keys. |
1704 |
'password', 'verify_certificates': True, |
1705 |
'scheme': 'scheme', 'host': 'host', 'port': None, |
|
1706 |
'path': None, 'realm': None} |
|
3777.1.11
by Aaron Bentley
Ensure changed-name updates clear old values |
1707 |
self.assertEqual(CREDENTIALS, credentials) |
1708 |
||
2900.2.5
by Vincent Ladeuil
ake ftp aware of authentication config. |
1709 |
|
2900.2.14
by Vincent Ladeuil
More tests. |
1710 |
class TestAuthenticationConfig(tests.TestCase): |
1711 |
"""Test AuthenticationConfig behaviour"""
|
|
1712 |
||
4222.3.1
by Jelmer Vernooij
Mention password when checking default prompt. |
1713 |
def _check_default_password_prompt(self, expected_prompt_format, scheme, |
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1714 |
host=None, port=None, realm=None, |
1715 |
path=None): |
|
2900.2.14
by Vincent Ladeuil
More tests. |
1716 |
if host is None: |
1717 |
host = 'bar.org' |
|
1718 |
user, password = 'jim', 'precious' |
|
1719 |
expected_prompt = expected_prompt_format % { |
|
1720 |
'scheme': scheme, 'host': host, 'port': port, |
|
1721 |
'user': user, 'realm': realm} |
|
1722 |
||
1723 |
stdout = tests.StringIOWrapper() |
|
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1724 |
stderr = tests.StringIOWrapper() |
2900.2.14
by Vincent Ladeuil
More tests. |
1725 |
ui.ui_factory = tests.TestUIFactory(stdin=password + '\n', |
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1726 |
stdout=stdout, stderr=stderr) |
2900.2.14
by Vincent Ladeuil
More tests. |
1727 |
# We use an empty conf so that the user is always prompted
|
1728 |
conf = config.AuthenticationConfig() |
|
1729 |
self.assertEquals(password, |
|
1730 |
conf.get_password(scheme, host, user, port=port, |
|
1731 |
realm=realm, path=path)) |
|
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1732 |
self.assertEquals(expected_prompt, stderr.getvalue()) |
1733 |
self.assertEquals('', stdout.getvalue()) |
|
2900.2.14
by Vincent Ladeuil
More tests. |
1734 |
|
4222.3.2
by Jelmer Vernooij
Prompt for user names if they are not in the configuration. |
1735 |
def _check_default_username_prompt(self, expected_prompt_format, scheme, |
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1736 |
host=None, port=None, realm=None, |
1737 |
path=None): |
|
4222.3.2
by Jelmer Vernooij
Prompt for user names if they are not in the configuration. |
1738 |
if host is None: |
1739 |
host = 'bar.org' |
|
1740 |
username = 'jim' |
|
1741 |
expected_prompt = expected_prompt_format % { |
|
1742 |
'scheme': scheme, 'host': host, 'port': port, |
|
1743 |
'realm': realm} |
|
1744 |
stdout = tests.StringIOWrapper() |
|
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1745 |
stderr = tests.StringIOWrapper() |
4222.3.2
by Jelmer Vernooij
Prompt for user names if they are not in the configuration. |
1746 |
ui.ui_factory = tests.TestUIFactory(stdin=username+ '\n', |
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1747 |
stdout=stdout, stderr=stderr) |
4222.3.2
by Jelmer Vernooij
Prompt for user names if they are not in the configuration. |
1748 |
# We use an empty conf so that the user is always prompted
|
1749 |
conf = config.AuthenticationConfig() |
|
4222.3.5
by Jelmer Vernooij
Fix test. |
1750 |
self.assertEquals(username, conf.get_user(scheme, host, port=port, |
1751 |
realm=realm, path=path, ask=True)) |
|
4368.3.1
by Vincent Ladeuil
Use stderr for UI prompt to address bug #376582. |
1752 |
self.assertEquals(expected_prompt, stderr.getvalue()) |
1753 |
self.assertEquals('', stdout.getvalue()) |
|
4222.3.2
by Jelmer Vernooij
Prompt for user names if they are not in the configuration. |
1754 |
|
1755 |
def test_username_defaults_prompts(self): |
|
1756 |
# HTTP prompts can't be tested here, see test_http.py
|
|
1757 |
self._check_default_username_prompt('FTP %(host)s username: ', 'ftp') |
|
1758 |
self._check_default_username_prompt( |
|
1759 |
'FTP %(host)s:%(port)d username: ', 'ftp', port=10020) |
|
1760 |
self._check_default_username_prompt( |
|
1761 |
'SSH %(host)s:%(port)d username: ', 'ssh', port=12345) |
|
1762 |
||
4222.3.11
by Jelmer Vernooij
Add test to make sure the default= parameter works. |
1763 |
def test_username_default_no_prompt(self): |
1764 |
conf = config.AuthenticationConfig() |
|
4304.2.1
by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced |
1765 |
self.assertEquals(None, |
4222.3.11
by Jelmer Vernooij
Add test to make sure the default= parameter works. |
1766 |
conf.get_user('ftp', 'example.com')) |
4304.2.1
by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced |
1767 |
self.assertEquals("explicitdefault", |
4222.3.11
by Jelmer Vernooij
Add test to make sure the default= parameter works. |
1768 |
conf.get_user('ftp', 'example.com', default="explicitdefault")) |
1769 |
||
4222.3.1
by Jelmer Vernooij
Mention password when checking default prompt. |
1770 |
def test_password_default_prompts(self): |
2900.2.19
by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests. |
1771 |
# HTTP prompts can't be tested here, see test_http.py
|
4222.3.1
by Jelmer Vernooij
Mention password when checking default prompt. |
1772 |
self._check_default_password_prompt( |
1773 |
'FTP %(user)s@%(host)s password: ', 'ftp') |
|
1774 |
self._check_default_password_prompt( |
|
1775 |
'FTP %(user)s@%(host)s:%(port)d password: ', 'ftp', port=10020) |
|
1776 |
self._check_default_password_prompt( |
|
1777 |
'SSH %(user)s@%(host)s:%(port)d password: ', 'ssh', port=12345) |
|
2900.2.14
by Vincent Ladeuil
More tests. |
1778 |
# SMTP port handling is a bit special (it's handled if embedded in the
|
1779 |
# host too)
|
|
2900.2.22
by Vincent Ladeuil
Polishing. |
1780 |
# FIXME: should we: forbid that, extend it to other schemes, leave
|
1781 |
# things as they are that's fine thank you ?
|
|
4222.3.1
by Jelmer Vernooij
Mention password when checking default prompt. |
1782 |
self._check_default_password_prompt('SMTP %(user)s@%(host)s password: ', |
4304.2.1
by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced |
1783 |
'smtp') |
4222.3.1
by Jelmer Vernooij
Mention password when checking default prompt. |
1784 |
self._check_default_password_prompt('SMTP %(user)s@%(host)s password: ', |
4304.2.1
by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced |
1785 |
'smtp', host='bar.org:10025') |
4222.3.1
by Jelmer Vernooij
Mention password when checking default prompt. |
1786 |
self._check_default_password_prompt( |
2900.2.14
by Vincent Ladeuil
More tests. |
1787 |
'SMTP %(user)s@%(host)s:%(port)d password: ', |
1788 |
'smtp', port=10025) |
|
1789 |
||
3420.1.2
by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user. |
1790 |
def test_ssh_password_emits_warning(self): |
1791 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1792 |
"""
|
|
1793 |
[ssh with password]
|
|
1794 |
scheme=ssh
|
|
1795 |
host=bar.org
|
|
1796 |
user=jim
|
|
1797 |
password=jimpass
|
|
1798 |
""")) |
|
1799 |
entered_password = 'typed-by-hand' |
|
1800 |
stdout = tests.StringIOWrapper() |
|
4449.3.30
by Martin Pool
Tweaks to test_config ui factory use |
1801 |
stderr = tests.StringIOWrapper() |
3420.1.2
by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user. |
1802 |
ui.ui_factory = tests.TestUIFactory(stdin=entered_password + '\n', |
4449.3.30
by Martin Pool
Tweaks to test_config ui factory use |
1803 |
stdout=stdout, stderr=stderr) |
3420.1.2
by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user. |
1804 |
|
1805 |
# Since the password defined in the authentication config is ignored,
|
|
1806 |
# the user is prompted
|
|
1807 |
self.assertEquals(entered_password, |
|
1808 |
conf.get_password('ssh', 'bar.org', user='jim')) |
|
1809 |
self.assertContainsRe( |
|
4794.1.17
by Robert Collins
Fix from vila for type log_log. |
1810 |
self.get_log(), |
3420.1.2
by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user. |
1811 |
'password ignored in section \[ssh with password\]') |
1812 |
||
3420.1.3
by Vincent Ladeuil
John's review feedback. |
1813 |
def test_ssh_without_password_doesnt_emit_warning(self): |
1814 |
conf = config.AuthenticationConfig(_file=StringIO( |
|
1815 |
"""
|
|
1816 |
[ssh with password]
|
|
1817 |
scheme=ssh
|
|
1818 |
host=bar.org
|
|
1819 |
user=jim
|
|
1820 |
""")) |
|
1821 |
entered_password = 'typed-by-hand' |
|
1822 |
stdout = tests.StringIOWrapper() |
|
4449.3.30
by Martin Pool
Tweaks to test_config ui factory use |
1823 |
stderr = tests.StringIOWrapper() |
3420.1.3
by Vincent Ladeuil
John's review feedback. |
1824 |
ui.ui_factory = tests.TestUIFactory(stdin=entered_password + '\n', |
4449.3.30
by Martin Pool
Tweaks to test_config ui factory use |
1825 |
stdout=stdout, |
1826 |
stderr=stderr) |
|
3420.1.3
by Vincent Ladeuil
John's review feedback. |
1827 |
|
1828 |
# Since the password defined in the authentication config is ignored,
|
|
1829 |
# the user is prompted
|
|
1830 |
self.assertEquals(entered_password, |
|
1831 |
conf.get_password('ssh', 'bar.org', user='jim')) |
|
3420.1.4
by Vincent Ladeuil
Fix comment. |
1832 |
# No warning shoud be emitted since there is no password. We are only
|
1833 |
# providing "user".
|
|
3420.1.3
by Vincent Ladeuil
John's review feedback. |
1834 |
self.assertNotContainsRe( |
4794.1.15
by Robert Collins
Review feedback. |
1835 |
self.get_log(), |
3420.1.3
by Vincent Ladeuil
John's review feedback. |
1836 |
'password ignored in section \[ssh with password\]') |
1837 |
||
4283.1.3
by Jelmer Vernooij
Add test to make sure AuthenticationConfig queries for fallback credentials. |
1838 |
def test_uses_fallback_stores(self): |
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1839 |
self.overrideAttr(config, 'credential_store_registry', |
1840 |
config.CredentialStoreRegistry()) |
|
4283.1.3
by Jelmer Vernooij
Add test to make sure AuthenticationConfig queries for fallback credentials. |
1841 |
store = StubCredentialStore() |
1842 |
store.add_credentials("http", "example.com", "joe", "secret") |
|
1843 |
config.credential_store_registry.register("stub", store, fallback=True) |
|
1844 |
conf = config.AuthenticationConfig(_file=StringIO()) |
|
1845 |
creds = conf.get_credentials("http", "example.com") |
|
1846 |
self.assertEquals("joe", creds["user"]) |
|
1847 |
self.assertEquals("secret", creds["password"]) |
|
1848 |
||
2900.2.14
by Vincent Ladeuil
More tests. |
1849 |
|
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1850 |
class StubCredentialStore(config.CredentialStore): |
1851 |
||
1852 |
def __init__(self): |
|
1853 |
self._username = {} |
|
1854 |
self._password = {} |
|
1855 |
||
1856 |
def add_credentials(self, scheme, host, user, password=None): |
|
1857 |
self._username[(scheme, host)] = user |
|
1858 |
self._password[(scheme, host)] = password |
|
1859 |
||
1860 |
def get_credentials(self, scheme, host, port=None, user=None, |
|
1861 |
path=None, realm=None): |
|
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1862 |
key = (scheme, host) |
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1863 |
if not key in self._username: |
1864 |
return None |
|
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1865 |
return { "scheme": scheme, "host": host, "port": port, |
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1866 |
"user": self._username[key], "password": self._password[key]} |
1867 |
||
1868 |
||
1869 |
class CountingCredentialStore(config.CredentialStore): |
|
1870 |
||
1871 |
def __init__(self): |
|
1872 |
self._calls = 0 |
|
1873 |
||
1874 |
def get_credentials(self, scheme, host, port=None, user=None, |
|
1875 |
path=None, realm=None): |
|
1876 |
self._calls += 1 |
|
1877 |
return None |
|
1878 |
||
1879 |
||
3757.3.1
by Vincent Ladeuil
Add credential stores plugging. |
1880 |
class TestCredentialStoreRegistry(tests.TestCase): |
1881 |
||
1882 |
def _get_cs_registry(self): |
|
1883 |
return config.credential_store_registry |
|
1884 |
||
1885 |
def test_default_credential_store(self): |
|
1886 |
r = self._get_cs_registry() |
|
1887 |
default = r.get_credential_store(None) |
|
1888 |
self.assertIsInstance(default, config.PlainTextCredentialStore) |
|
1889 |
||
1890 |
def test_unknown_credential_store(self): |
|
1891 |
r = self._get_cs_registry() |
|
1892 |
# It's hard to imagine someone creating a credential store named
|
|
1893 |
# 'unknown' so we use that as an never registered key.
|
|
1894 |
self.assertRaises(KeyError, r.get_credential_store, 'unknown') |
|
1895 |
||
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1896 |
def test_fallback_none_registered(self): |
1897 |
r = config.CredentialStoreRegistry() |
|
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1898 |
self.assertEquals(None, |
1899 |
r.get_fallback_credentials("http", "example.com")) |
|
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1900 |
|
1901 |
def test_register(self): |
|
1902 |
r = config.CredentialStoreRegistry() |
|
1903 |
r.register("stub", StubCredentialStore(), fallback=False) |
|
1904 |
r.register("another", StubCredentialStore(), fallback=True) |
|
1905 |
self.assertEquals(["another", "stub"], r.keys()) |
|
1906 |
||
1907 |
def test_register_lazy(self): |
|
1908 |
r = config.CredentialStoreRegistry() |
|
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1909 |
r.register_lazy("stub", "bzrlib.tests.test_config", |
1910 |
"StubCredentialStore", fallback=False) |
|
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1911 |
self.assertEquals(["stub"], r.keys()) |
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1912 |
self.assertIsInstance(r.get_credential_store("stub"), |
1913 |
StubCredentialStore) |
|
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1914 |
|
1915 |
def test_is_fallback(self): |
|
1916 |
r = config.CredentialStoreRegistry() |
|
1917 |
r.register("stub1", None, fallback=False) |
|
1918 |
r.register("stub2", None, fallback=True) |
|
1919 |
self.assertEquals(False, r.is_fallback("stub1")) |
|
1920 |
self.assertEquals(True, r.is_fallback("stub2")) |
|
1921 |
||
1922 |
def test_no_fallback(self): |
|
1923 |
r = config.CredentialStoreRegistry() |
|
1924 |
store = CountingCredentialStore() |
|
1925 |
r.register("count", store, fallback=False) |
|
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1926 |
self.assertEquals(None, |
1927 |
r.get_fallback_credentials("http", "example.com")) |
|
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1928 |
self.assertEquals(0, store._calls) |
1929 |
||
1930 |
def test_fallback_credentials(self): |
|
1931 |
r = config.CredentialStoreRegistry() |
|
1932 |
store = StubCredentialStore() |
|
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1933 |
store.add_credentials("http", "example.com", |
1934 |
"somebody", "geheim") |
|
4283.1.2
by Jelmer Vernooij
Add tests, NEWS item. |
1935 |
r.register("stub", store, fallback=True) |
1936 |
creds = r.get_fallback_credentials("http", "example.com") |
|
1937 |
self.assertEquals("somebody", creds["user"]) |
|
1938 |
self.assertEquals("geheim", creds["password"]) |
|
1939 |
||
4283.2.1
by Vincent Ladeuil
Add a test and cleanup some PEP8 issues. |
1940 |
def test_fallback_first_wins(self): |
1941 |
r = config.CredentialStoreRegistry() |
|
1942 |
stub1 = StubCredentialStore() |
|
1943 |
stub1.add_credentials("http", "example.com", |
|
1944 |
"somebody", "stub1") |
|
1945 |
r.register("stub1", stub1, fallback=True) |
|
1946 |
stub2 = StubCredentialStore() |
|
1947 |
stub2.add_credentials("http", "example.com", |
|
1948 |
"somebody", "stub2") |
|
1949 |
r.register("stub2", stub1, fallback=True) |
|
1950 |
creds = r.get_fallback_credentials("http", "example.com") |
|
1951 |
self.assertEquals("somebody", creds["user"]) |
|
1952 |
self.assertEquals("stub1", creds["password"]) |
|
1953 |
||
3757.3.1
by Vincent Ladeuil
Add credential stores plugging. |
1954 |
|
1955 |
class TestPlainTextCredentialStore(tests.TestCase): |
|
1956 |
||
1957 |
def test_decode_password(self): |
|
1958 |
r = config.credential_store_registry |
|
1959 |
plain_text = r.get_credential_store() |
|
1960 |
decoded = plain_text.decode_password(dict(password='secret')) |
|
1961 |
self.assertEquals('secret', decoded) |
|
1962 |
||
1963 |
||
2900.2.14
by Vincent Ladeuil
More tests. |
1964 |
# FIXME: Once we have a way to declare authentication to all test servers, we
|
2900.2.5
by Vincent Ladeuil
ake ftp aware of authentication config. |
1965 |
# can implement generic tests.
|
2900.2.15
by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step). |
1966 |
# test_user_password_in_url
|
1967 |
# test_user_in_url_password_from_config
|
|
1968 |
# test_user_in_url_password_prompted
|
|
1969 |
# test_user_in_config
|
|
1970 |
# test_user_getpass.getuser
|
|
1971 |
# test_user_prompted ?
|
|
2900.2.5
by Vincent Ladeuil
ake ftp aware of authentication config. |
1972 |
class TestAuthenticationRing(tests.TestCaseWithTransport): |
1973 |
pass
|