~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testconfig.py

Exclude more files from dumb-rsync upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005 by Canonical Ltd
2
2
#   Authors: Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
23
23
import sys
24
24
 
25
25
#import bzrlib specific imports here
26
 
from bzrlib import (
27
 
    config,
28
 
    errors,
29
 
    osutils,
30
 
    urlutils,
31
 
    )
32
 
from bzrlib.branch import Branch
33
 
from bzrlib.bzrdir import BzrDir
34
 
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
35
 
 
36
 
 
37
 
sample_long_alias="log -r-15..-1 --line"
38
 
sample_config_text = u"""
39
 
[DEFAULT]
40
 
email=Erik B\u00e5gfors <erik@bagfors.nu>
41
 
editor=vim
42
 
gpg_signing_command=gnome-gpg
43
 
log_format=short
44
 
user_global_option=something
45
 
[ALIASES]
46
 
h=help
47
 
ll=""" + sample_long_alias + "\n"
48
 
 
49
 
 
50
 
sample_always_signatures = """
51
 
[DEFAULT]
52
 
check_signatures=ignore
53
 
create_signatures=always
54
 
"""
55
 
 
56
 
sample_ignore_signatures = """
57
 
[DEFAULT]
58
 
check_signatures=require
59
 
create_signatures=never
60
 
"""
61
 
 
62
 
sample_maybe_signatures = """
63
 
[DEFAULT]
64
 
check_signatures=ignore
65
 
create_signatures=when-required
66
 
"""
67
 
 
68
 
sample_branches_text = """
69
 
[http://www.example.com]
70
 
# Top level policy
71
 
email=Robert Collins <robertc@example.org>
72
 
normal_option = normal
73
 
appendpath_option = append
74
 
appendpath_option:policy = appendpath
75
 
norecurse_option = norecurse
76
 
norecurse_option:policy = norecurse
77
 
[http://www.example.com/ignoreparent]
78
 
# different project: ignore parent dir config
79
 
ignore_parents=true
80
 
[http://www.example.com/norecurse]
81
 
# configuration items that only apply to this dir
82
 
recurse=false
83
 
normal_option = norecurse
84
 
[http://www.example.com/dir]
85
 
appendpath_option = normal
86
 
[/b/]
87
 
check_signatures=require
88
 
# test trailing / matching with no children
89
 
[/a/]
90
 
check_signatures=check-available
91
 
gpg_signing_command=false
92
 
user_local_option=local
93
 
# test trailing / matching
94
 
[/a/*]
95
 
#subdirs will match but not the parent
96
 
[/a/c]
97
 
check_signatures=ignore
98
 
post_commit=bzrlib.tests.test_config.post_commit
99
 
#testing explicit beats globs
100
 
"""
 
26
import bzrlib.config as config
 
27
import bzrlib.errors as errors
 
28
from bzrlib.selftest import TestCase, TestCaseInTempDir
 
29
 
 
30
 
 
31
sample_config_text = ("[DEFAULT]\n"
 
32
                      "email=Robert Collins <robertc@example.com>\n"
 
33
                      "editor=vim\n"
 
34
                      "gpg_signing_command=gnome-gpg\n"
 
35
                      "user_global_option=something\n")
 
36
 
 
37
 
 
38
sample_always_signatures = ("[DEFAULT]\n"
 
39
                            "check_signatures=require\n")
 
40
 
 
41
 
 
42
sample_ignore_signatures = ("[DEFAULT]\n"
 
43
                            "check_signatures=ignore\n")
 
44
 
 
45
 
 
46
sample_maybe_signatures = ("[DEFAULT]\n"
 
47
                            "check_signatures=check-available\n")
 
48
 
 
49
 
 
50
sample_branches_text = ("[http://www.example.com]\n"
 
51
                        "# Top level policy\n"
 
52
                        "email=Robert Collins <robertc@example.org>\n"
 
53
                        "[http://www.example.com/useglobal]\n"
 
54
                        "# different project, forces global lookup\n"
 
55
                        "recurse=false\n"
 
56
                        "[/b/]\n"
 
57
                        "check_signatures=require\n"
 
58
                        "# test trailing / matching with no children\n"
 
59
                        "[/a/]\n"
 
60
                        "check_signatures=check-available\n"
 
61
                        "gpg_signing_command=false\n"
 
62
                        "user_local_option=local\n"
 
63
                        "# test trailing / matching\n"
 
64
                        "[/a/*]\n"
 
65
                        "#subdirs will match but not the parent\n"
 
66
                        "recurse=False\n"
 
67
                        "[/a/c]\n"
 
68
                        "check_signatures=ignore\n"
 
69
                        "post_commit=bzrlib.selftest.testconfig.post_commit\n"
 
70
                        "#testing explicit beats globs\n")
101
71
 
102
72
 
103
73
class InstrumentedConfigObj(object):
111
81
        self._calls.append(('__getitem__', key))
112
82
        return self
113
83
 
114
 
    def __init__(self, input, encoding=None):
115
 
        self._calls = [('__init__', input, encoding)]
 
84
    def __init__(self, input):
 
85
        self._calls = [('__init__', input)]
116
86
 
117
87
    def __setitem__(self, key, value):
118
88
        self._calls.append(('__setitem__', key, value))
119
89
 
120
 
    def __delitem__(self, key):
121
 
        self._calls.append(('__delitem__', key))
122
 
 
123
 
    def keys(self):
124
 
        self._calls.append(('keys',))
125
 
        return []
126
 
 
127
 
    def write(self, arg):
 
90
    def write(self):
128
91
        self._calls.append(('write',))
129
92
 
130
 
    def as_bool(self, value):
131
 
        self._calls.append(('as_bool', value))
132
 
        return False
133
 
 
134
 
    def get_value(self, section, name):
135
 
        self._calls.append(('get_value', section, name))
136
 
        return None
137
 
 
138
93
 
139
94
class FakeBranch(object):
140
95
 
141
 
    def __init__(self, base=None, user_id=None):
142
 
        if base is None:
143
 
            self.base = "http://example.com/branches/demo"
144
 
        else:
145
 
            self.base = base
146
 
        self.control_files = FakeControlFiles(user_id=user_id)
147
 
 
148
 
    def lock_write(self):
149
 
        pass
150
 
 
151
 
    def unlock(self):
152
 
        pass
153
 
 
154
 
 
155
 
class FakeControlFiles(object):
156
 
 
157
 
    def __init__(self, user_id=None):
158
 
        self.email = user_id
159
 
        self.files = {}
160
 
 
161
 
    def get_utf8(self, filename):
 
96
    def __init__(self):
 
97
        self.base = "http://example.com/branches/demo"
 
98
        self.email = 'Robert Collins <robertc@example.net>\n'
 
99
 
 
100
    def controlfile(self, filename, mode):
162
101
        if filename != 'email':
163
102
            raise NotImplementedError
164
103
        if self.email is not None:
165
104
            return StringIO(self.email)
166
 
        raise errors.NoSuchFile(filename)
167
 
 
168
 
    def get(self, filename):
169
 
        try:
170
 
            return StringIO(self.files[filename])
171
 
        except KeyError:
172
 
            raise errors.NoSuchFile(filename)
173
 
 
174
 
    def put(self, filename, fileobj):
175
 
        self.files[filename] = fileobj.read()
 
105
        raise errors.NoSuchFile
176
106
 
177
107
 
178
108
class InstrumentedConfig(config.Config):
192
122
        return self._signatures
193
123
 
194
124
 
195
 
bool_config = """[DEFAULT]
196
 
active = true
197
 
inactive = false
198
 
[UPPERCASE]
199
 
active = True
200
 
nonactive = False
201
 
"""
202
 
class TestConfigObj(TestCase):
203
 
    def test_get_bool(self):
204
 
        from bzrlib.config import ConfigObj
205
 
        co = ConfigObj(StringIO(bool_config))
206
 
        self.assertIs(co.get_bool('DEFAULT', 'active'), True)
207
 
        self.assertIs(co.get_bool('DEFAULT', 'inactive'), False)
208
 
        self.assertIs(co.get_bool('UPPERCASE', 'active'), True)
209
 
        self.assertIs(co.get_bool('UPPERCASE', 'nonactive'), False)
210
 
 
211
 
 
212
125
class TestConfig(TestCase):
213
126
 
214
127
    def test_constructs(self):
230
143
 
231
144
    def test_signatures_default(self):
232
145
        my_config = config.Config()
233
 
        self.assertFalse(my_config.signature_needed())
234
146
        self.assertEqual(config.CHECK_IF_POSSIBLE,
235
147
                         my_config.signature_checking())
236
 
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
237
 
                         my_config.signing_policy())
238
148
 
239
149
    def test_signatures_template_method(self):
240
150
        my_config = InstrumentedConfig()
260
170
        my_config = config.Config()
261
171
        self.assertEqual(None, my_config.post_commit())
262
172
 
263
 
    def test_log_format_default(self):
264
 
        my_config = config.Config()
265
 
        self.assertEqual('long', my_config.log_format())
266
 
 
267
173
 
268
174
class TestConfigPath(TestCase):
269
175
 
270
176
    def setUp(self):
271
177
        super(TestConfigPath, self).setUp()
 
178
        self.old_home = os.environ.get('HOME', None)
 
179
        self.old_appdata = os.environ.get('APPDATA', None)
272
180
        os.environ['HOME'] = '/home/bogus'
273
 
        if sys.platform == 'win32':
274
 
            os.environ['BZR_HOME'] = \
275
 
                r'C:\Documents and Settings\bogus\Application Data'
 
181
        os.environ['APPDATA'] = \
 
182
            r'C:\Documents and Settings\bogus\Application Data'
276
183
 
 
184
    def tearDown(self):
 
185
        if self.old_home is None:
 
186
            del os.environ['HOME']
 
187
        else:
 
188
            os.environ['HOME'] = self.old_home
 
189
        if self.old_appdata is None:
 
190
            del os.environ['APPDATA']
 
191
        else:
 
192
            os.environ['APPDATA'] = self.old_appdata
 
193
        super(TestConfigPath, self).tearDown()
 
194
    
277
195
    def test_config_dir(self):
278
196
        if sys.platform == 'win32':
279
197
            self.assertEqual(config.config_dir(), 
280
 
                'C:/Documents and Settings/bogus/Application Data/bazaar/2.0')
 
198
                r'C:\Documents and Settings\bogus\Application Data\bazaar\2.0')
281
199
        else:
282
200
            self.assertEqual(config.config_dir(), '/home/bogus/.bazaar')
283
201
 
284
202
    def test_config_filename(self):
285
203
        if sys.platform == 'win32':
286
204
            self.assertEqual(config.config_filename(), 
287
 
                'C:/Documents and Settings/bogus/Application Data/bazaar/2.0/bazaar.conf')
 
205
                r'C:\Documents and Settings\bogus\Application Data\bazaar\2.0\bazaar.conf')
288
206
        else:
289
207
            self.assertEqual(config.config_filename(),
290
208
                             '/home/bogus/.bazaar/bazaar.conf')
292
210
    def test_branches_config_filename(self):
293
211
        if sys.platform == 'win32':
294
212
            self.assertEqual(config.branches_config_filename(), 
295
 
                'C:/Documents and Settings/bogus/Application Data/bazaar/2.0/branches.conf')
 
213
                r'C:\Documents and Settings\bogus\Application Data\bazaar\2.0\branches.conf')
296
214
        else:
297
215
            self.assertEqual(config.branches_config_filename(),
298
216
                             '/home/bogus/.bazaar/branches.conf')
299
217
 
300
 
    def test_locations_config_filename(self):
301
 
        if sys.platform == 'win32':
302
 
            self.assertEqual(config.locations_config_filename(), 
303
 
                'C:/Documents and Settings/bogus/Application Data/bazaar/2.0/locations.conf')
304
 
        else:
305
 
            self.assertEqual(config.locations_config_filename(),
306
 
                             '/home/bogus/.bazaar/locations.conf')
307
 
 
308
218
class TestIniConfig(TestCase):
309
219
 
310
220
    def test_contructs(self):
311
221
        my_config = config.IniBasedConfig("nothing")
312
222
 
313
223
    def test_from_fp(self):
314
 
        config_file = StringIO(sample_config_text.encode('utf-8'))
 
224
        config_file = StringIO(sample_config_text)
315
225
        my_config = config.IniBasedConfig(None)
316
226
        self.failUnless(
317
227
            isinstance(my_config._get_parser(file=config_file),
318
228
                        ConfigObj))
319
229
 
320
230
    def test_cached(self):
321
 
        config_file = StringIO(sample_config_text.encode('utf-8'))
 
231
        config_file = StringIO(sample_config_text)
322
232
        my_config = config.IniBasedConfig(None)
323
233
        parser = my_config._get_parser(file=config_file)
324
234
        self.failUnless(my_config._get_parser() is parser)
339
249
        finally:
340
250
            config.ConfigObj = oldparserclass
341
251
        self.failUnless(isinstance(parser, InstrumentedConfigObj))
342
 
        self.assertEqual(parser._calls, [('__init__', config.config_filename(),
343
 
                                          'utf-8')])
344
 
 
345
 
 
346
 
class TestBranchConfig(TestCaseWithTransport):
 
252
        self.assertEqual(parser._calls, [('__init__', config.config_filename())])
 
253
 
 
254
 
 
255
class TestBranchConfig(TestCaseInTempDir):
347
256
 
348
257
    def test_constructs(self):
349
258
        branch = FakeBranch()
357
266
        self.assertEqual(branch.base, location_config.location)
358
267
        self.failUnless(location_config is my_config._get_location_config())
359
268
 
360
 
    def test_get_config(self):
361
 
        """The Branch.get_config method works properly"""
362
 
        b = BzrDir.create_standalone_workingtree('.').branch
363
 
        my_config = b.get_config()
364
 
        self.assertIs(my_config.get_user_option('wacky'), None)
365
 
        my_config.set_user_option('wacky', 'unlikely')
366
 
        self.assertEqual(my_config.get_user_option('wacky'), 'unlikely')
367
 
 
368
 
        # Ensure we get the same thing if we start again
369
 
        b2 = Branch.open('.')
370
 
        my_config2 = b2.get_config()
371
 
        self.assertEqual(my_config2.get_user_option('wacky'), 'unlikely')
372
 
 
373
 
    def test_has_explicit_nickname(self):
374
 
        b = self.make_branch('.')
375
 
        self.assertFalse(b.get_config().has_explicit_nickname())
376
 
        b.nick = 'foo'
377
 
        self.assertTrue(b.get_config().has_explicit_nickname())
378
 
 
379
 
    def test_config_url(self):
380
 
        """The Branch.get_config will use section that uses a local url"""
381
 
        branch = self.make_branch('branch')
382
 
        self.assertEqual('branch', branch.nick)
383
 
 
384
 
        locations = config.locations_config_filename()
385
 
        config.ensure_config_dir_exists()
386
 
        local_url = urlutils.local_path_to_url('branch')
387
 
        open(locations, 'wb').write('[%s]\nnickname = foobar' 
388
 
                                    % (local_url,))
389
 
        self.assertEqual('foobar', branch.nick)
390
 
 
391
 
    def test_config_local_path(self):
392
 
        """The Branch.get_config will use a local system path"""
393
 
        branch = self.make_branch('branch')
394
 
        self.assertEqual('branch', branch.nick)
395
 
 
396
 
        locations = config.locations_config_filename()
397
 
        config.ensure_config_dir_exists()
398
 
        open(locations, 'wb').write('[%s/branch]\nnickname = barry' 
399
 
                                    % (osutils.getcwd().encode('utf8'),))
400
 
        self.assertEqual('barry', branch.nick)
401
 
 
402
 
    def test_config_creates_local(self):
403
 
        """Creating a new entry in config uses a local path."""
404
 
        branch = self.make_branch('branch', format='knit')
405
 
        branch.set_push_location('http://foobar')
406
 
        locations = config.locations_config_filename()
407
 
        local_path = osutils.getcwd().encode('utf8')
408
 
        # Surprisingly ConfigObj doesn't create a trailing newline
409
 
        self.check_file_contents(locations,
410
 
            '[%s/branch]\npush_location = http://foobar\npush_location:policy = norecurse' % (local_path,))
411
 
 
412
 
    def test_autonick_urlencoded(self):
413
 
        b = self.make_branch('!repo')
414
 
        self.assertEqual('!repo', b.get_config().get_nickname())
415
 
 
416
269
 
417
270
class TestGlobalConfigItems(TestCase):
418
271
 
419
272
    def test_user_id(self):
420
 
        config_file = StringIO(sample_config_text.encode('utf-8'))
 
273
        config_file = StringIO(sample_config_text)
421
274
        my_config = config.GlobalConfig()
422
275
        my_config._parser = my_config._get_parser(file=config_file)
423
 
        self.assertEqual(u"Erik B\u00e5gfors <erik@bagfors.nu>",
 
276
        self.assertEqual("Robert Collins <robertc@example.com>",
424
277
                         my_config._get_user_id())
425
278
 
426
279
    def test_absent_user_id(self):
430
283
        self.assertEqual(None, my_config._get_user_id())
431
284
 
432
285
    def test_configured_editor(self):
433
 
        config_file = StringIO(sample_config_text.encode('utf-8'))
 
286
        config_file = StringIO(sample_config_text)
434
287
        my_config = config.GlobalConfig()
435
288
        my_config._parser = my_config._get_parser(file=config_file)
436
289
        self.assertEqual("vim", my_config.get_editor())
439
292
        config_file = StringIO(sample_always_signatures)
440
293
        my_config = config.GlobalConfig()
441
294
        my_config._parser = my_config._get_parser(file=config_file)
442
 
        self.assertEqual(config.CHECK_NEVER,
 
295
        self.assertEqual(config.CHECK_ALWAYS,
443
296
                         my_config.signature_checking())
444
 
        self.assertEqual(config.SIGN_ALWAYS,
445
 
                         my_config.signing_policy())
446
297
        self.assertEqual(True, my_config.signature_needed())
447
298
 
448
299
    def test_signatures_if_possible(self):
449
300
        config_file = StringIO(sample_maybe_signatures)
450
301
        my_config = config.GlobalConfig()
451
302
        my_config._parser = my_config._get_parser(file=config_file)
452
 
        self.assertEqual(config.CHECK_NEVER,
 
303
        self.assertEqual(config.CHECK_IF_POSSIBLE,
453
304
                         my_config.signature_checking())
454
 
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
455
 
                         my_config.signing_policy())
456
305
        self.assertEqual(False, my_config.signature_needed())
457
306
 
458
307
    def test_signatures_ignore(self):
459
308
        config_file = StringIO(sample_ignore_signatures)
460
309
        my_config = config.GlobalConfig()
461
310
        my_config._parser = my_config._get_parser(file=config_file)
462
 
        self.assertEqual(config.CHECK_ALWAYS,
 
311
        self.assertEqual(config.CHECK_NEVER,
463
312
                         my_config.signature_checking())
464
 
        self.assertEqual(config.SIGN_NEVER,
465
 
                         my_config.signing_policy())
466
313
        self.assertEqual(False, my_config.signature_needed())
467
314
 
468
315
    def _get_sample_config(self):
469
 
        config_file = StringIO(sample_config_text.encode('utf-8'))
 
316
        config_file = StringIO(sample_config_text)
470
317
        my_config = config.GlobalConfig()
471
318
        my_config._parser = my_config._get_parser(file=config_file)
472
319
        return my_config
499
346
        my_config = self._get_sample_config()
500
347
        self.assertEqual(None, my_config.post_commit())
501
348
 
502
 
    def test_configured_logformat(self):
503
 
        my_config = self._get_sample_config()
504
 
        self.assertEqual("short", my_config.log_format())
505
 
 
506
 
    def test_get_alias(self):
507
 
        my_config = self._get_sample_config()
508
 
        self.assertEqual('help', my_config.get_alias('h'))
509
 
 
510
 
    def test_get_no_alias(self):
511
 
        my_config = self._get_sample_config()
512
 
        self.assertEqual(None, my_config.get_alias('foo'))
513
 
 
514
 
    def test_get_long_alias(self):
515
 
        my_config = self._get_sample_config()
516
 
        self.assertEqual(sample_long_alias, my_config.get_alias('ll'))
517
 
 
518
 
 
519
 
class TestLocationConfig(TestCaseInTempDir):
 
349
 
 
350
class TestLocationConfig(TestCase):
520
351
 
521
352
    def test_constructs(self):
522
353
        my_config = config.LocationConfig('http://example.com')
529
360
        # replace the class that is constructured, to check its parameters
530
361
        oldparserclass = config.ConfigObj
531
362
        config.ConfigObj = InstrumentedConfigObj
 
363
        my_config = config.LocationConfig('http://www.example.com')
532
364
        try:
533
 
            my_config = config.LocationConfig('http://www.example.com')
534
365
            parser = my_config._get_parser()
535
366
        finally:
536
367
            config.ConfigObj = oldparserclass
537
368
        self.failUnless(isinstance(parser, InstrumentedConfigObj))
538
369
        self.assertEqual(parser._calls,
539
 
                         [('__init__', config.locations_config_filename(),
540
 
                           'utf-8')])
541
 
        config.ensure_config_dir_exists()
542
 
        #os.mkdir(config.config_dir())
543
 
        f = file(config.branches_config_filename(), 'wb')
544
 
        f.write('')
545
 
        f.close()
546
 
        oldparserclass = config.ConfigObj
547
 
        config.ConfigObj = InstrumentedConfigObj
548
 
        try:
549
 
            my_config = config.LocationConfig('http://www.example.com')
550
 
            parser = my_config._get_parser()
551
 
        finally:
552
 
            config.ConfigObj = oldparserclass
 
370
                         [('__init__', config.branches_config_filename())])
553
371
 
554
372
    def test_get_global_config(self):
555
 
        my_config = config.BranchConfig(FakeBranch('http://example.com'))
 
373
        my_config = config.LocationConfig('http://example.com')
556
374
        global_config = my_config._get_global_config()
557
375
        self.failUnless(isinstance(global_config, config.GlobalConfig))
558
376
        self.failUnless(global_config is my_config._get_global_config())
559
377
 
560
 
    def test__get_matching_sections_no_match(self):
561
 
        self.get_branch_config('/')
562
 
        self.assertEqual([], self.my_location_config._get_matching_sections())
 
378
    def test__get_section_no_match(self):
 
379
        self.get_location_config('/')
 
380
        self.assertEqual(None, self.my_config._get_section())
563
381
        
564
 
    def test__get_matching_sections_exact(self):
565
 
        self.get_branch_config('http://www.example.com')
566
 
        self.assertEqual([('http://www.example.com', '')],
567
 
                         self.my_location_config._get_matching_sections())
 
382
    def test__get_section_exact(self):
 
383
        self.get_location_config('http://www.example.com')
 
384
        self.assertEqual('http://www.example.com',
 
385
                         self.my_config._get_section())
568
386
   
569
 
    def test__get_matching_sections_suffix_does_not(self):
570
 
        self.get_branch_config('http://www.example.com-com')
571
 
        self.assertEqual([], self.my_location_config._get_matching_sections())
572
 
 
573
 
    def test__get_matching_sections_subdir_recursive(self):
574
 
        self.get_branch_config('http://www.example.com/com')
575
 
        self.assertEqual([('http://www.example.com', 'com')],
576
 
                         self.my_location_config._get_matching_sections())
577
 
 
578
 
    def test__get_matching_sections_ignoreparent(self):
579
 
        self.get_branch_config('http://www.example.com/ignoreparent')
580
 
        self.assertEqual([('http://www.example.com/ignoreparent', '')],
581
 
                         self.my_location_config._get_matching_sections())
582
 
 
583
 
    def test__get_matching_sections_ignoreparent_subdir(self):
584
 
        self.get_branch_config(
585
 
            'http://www.example.com/ignoreparent/childbranch')
586
 
        self.assertEqual([('http://www.example.com/ignoreparent', 'childbranch')],
587
 
                         self.my_location_config._get_matching_sections())
588
 
 
589
 
    def test__get_matching_sections_subdir_trailing_slash(self):
590
 
        self.get_branch_config('/b')
591
 
        self.assertEqual([('/b/', '')],
592
 
                         self.my_location_config._get_matching_sections())
593
 
 
594
 
    def test__get_matching_sections_subdir_child(self):
595
 
        self.get_branch_config('/a/foo')
596
 
        self.assertEqual([('/a/*', ''), ('/a/', 'foo')],
597
 
                         self.my_location_config._get_matching_sections())
598
 
 
599
 
    def test__get_matching_sections_subdir_child_child(self):
600
 
        self.get_branch_config('/a/foo/bar')
601
 
        self.assertEqual([('/a/*', 'bar'), ('/a/', 'foo/bar')],
602
 
                         self.my_location_config._get_matching_sections())
603
 
 
604
 
    def test__get_matching_sections_trailing_slash_with_children(self):
605
 
        self.get_branch_config('/a/')
606
 
        self.assertEqual([('/a/', '')],
607
 
                         self.my_location_config._get_matching_sections())
608
 
 
609
 
    def test__get_matching_sections_explicit_over_glob(self):
610
 
        # XXX: 2006-09-08 jamesh
611
 
        # This test only passes because ord('c') > ord('*').  If there
612
 
        # was a config section for '/a/?', it would get precedence
613
 
        # over '/a/c'.
614
 
        self.get_branch_config('/a/c')
615
 
        self.assertEqual([('/a/c', ''), ('/a/*', ''), ('/a/', 'c')],
616
 
                         self.my_location_config._get_matching_sections())
617
 
 
618
 
    def test__get_option_policy_normal(self):
619
 
        self.get_branch_config('http://www.example.com')
620
 
        self.assertEqual(
621
 
            self.my_location_config._get_config_policy(
622
 
            'http://www.example.com', 'normal_option'),
623
 
            config.POLICY_NONE)
624
 
 
625
 
    def test__get_option_policy_norecurse(self):
626
 
        self.get_branch_config('http://www.example.com')
627
 
        self.assertEqual(
628
 
            self.my_location_config._get_option_policy(
629
 
            'http://www.example.com', 'norecurse_option'),
630
 
            config.POLICY_NORECURSE)
631
 
        # Test old recurse=False setting:
632
 
        self.assertEqual(
633
 
            self.my_location_config._get_option_policy(
634
 
            'http://www.example.com/norecurse', 'normal_option'),
635
 
            config.POLICY_NORECURSE)
636
 
 
637
 
    def test__get_option_policy_normal(self):
638
 
        self.get_branch_config('http://www.example.com')
639
 
        self.assertEqual(
640
 
            self.my_location_config._get_option_policy(
641
 
            'http://www.example.com', 'appendpath_option'),
642
 
            config.POLICY_APPENDPATH)
 
387
    def test__get_section_suffix_does_not(self):
 
388
        self.get_location_config('http://www.example.com-com')
 
389
        self.assertEqual(None, self.my_config._get_section())
 
390
 
 
391
    def test__get_section_subdir_recursive(self):
 
392
        self.get_location_config('http://www.example.com/com')
 
393
        self.assertEqual('http://www.example.com',
 
394
                         self.my_config._get_section())
 
395
 
 
396
    def test__get_section_subdir_matches(self):
 
397
        self.get_location_config('http://www.example.com/useglobal')
 
398
        self.assertEqual('http://www.example.com/useglobal',
 
399
                         self.my_config._get_section())
 
400
 
 
401
    def test__get_section_subdir_nonrecursive(self):
 
402
        self.get_location_config(
 
403
            'http://www.example.com/useglobal/childbranch')
 
404
        self.assertEqual('http://www.example.com',
 
405
                         self.my_config._get_section())
 
406
 
 
407
    def test__get_section_subdir_trailing_slash(self):
 
408
        self.get_location_config('/b')
 
409
        self.assertEqual('/b/', self.my_config._get_section())
 
410
 
 
411
    def test__get_section_subdir_child(self):
 
412
        self.get_location_config('/a/foo')
 
413
        self.assertEqual('/a/*', self.my_config._get_section())
 
414
 
 
415
    def test__get_section_subdir_child_child(self):
 
416
        self.get_location_config('/a/foo/bar')
 
417
        self.assertEqual('/a/', self.my_config._get_section())
 
418
 
 
419
    def test__get_section_trailing_slash_with_children(self):
 
420
        self.get_location_config('/a/')
 
421
        self.assertEqual('/a/', self.my_config._get_section())
 
422
 
 
423
    def test__get_section_explicit_over_glob(self):
 
424
        self.get_location_config('/a/c')
 
425
        self.assertEqual('/a/c', self.my_config._get_section())
 
426
 
 
427
    def get_location_config(self, location, global_config=None):
 
428
        if global_config is None:
 
429
            global_file = StringIO(sample_config_text)
 
430
        else:
 
431
            global_file = StringIO(global_config)
 
432
        branches_file = StringIO(sample_branches_text)
 
433
        self.my_config = config.LocationConfig(location)
 
434
        self.my_config._get_parser(branches_file)
 
435
        self.my_config._get_global_config()._get_parser(global_file)
643
436
 
644
437
    def test_location_without_username(self):
645
 
        self.get_branch_config('http://www.example.com/ignoreparent')
646
 
        self.assertEqual(u'Erik B\u00e5gfors <erik@bagfors.nu>',
 
438
        self.get_location_config('http://www.example.com/useglobal')
 
439
        self.assertEqual('Robert Collins <robertc@example.com>',
647
440
                         self.my_config.username())
648
441
 
649
442
    def test_location_not_listed(self):
650
 
        """Test that the global username is used when no location matches"""
651
 
        self.get_branch_config('/home/robertc/sources')
652
 
        self.assertEqual(u'Erik B\u00e5gfors <erik@bagfors.nu>',
 
443
        self.get_location_config('/home/robertc/sources')
 
444
        self.assertEqual('Robert Collins <robertc@example.com>',
653
445
                         self.my_config.username())
654
446
 
655
447
    def test_overriding_location(self):
656
 
        self.get_branch_config('http://www.example.com/foo')
 
448
        self.get_location_config('http://www.example.com/foo')
657
449
        self.assertEqual('Robert Collins <robertc@example.org>',
658
450
                         self.my_config.username())
659
451
 
660
452
    def test_signatures_not_set(self):
661
 
        self.get_branch_config('http://www.example.com',
 
453
        self.get_location_config('http://www.example.com',
662
454
                                 global_config=sample_ignore_signatures)
663
 
        self.assertEqual(config.CHECK_ALWAYS,
 
455
        self.assertEqual(config.CHECK_NEVER,
664
456
                         self.my_config.signature_checking())
665
 
        self.assertEqual(config.SIGN_NEVER,
666
 
                         self.my_config.signing_policy())
667
457
 
668
458
    def test_signatures_never(self):
669
 
        self.get_branch_config('/a/c')
 
459
        self.get_location_config('/a/c')
670
460
        self.assertEqual(config.CHECK_NEVER,
671
461
                         self.my_config.signature_checking())
672
462
        
673
463
    def test_signatures_when_available(self):
674
 
        self.get_branch_config('/a/', global_config=sample_ignore_signatures)
 
464
        self.get_location_config('/a/', global_config=sample_ignore_signatures)
675
465
        self.assertEqual(config.CHECK_IF_POSSIBLE,
676
466
                         self.my_config.signature_checking())
677
467
        
678
468
    def test_signatures_always(self):
679
 
        self.get_branch_config('/b')
 
469
        self.get_location_config('/b')
680
470
        self.assertEqual(config.CHECK_ALWAYS,
681
471
                         self.my_config.signature_checking())
682
472
        
683
473
    def test_gpg_signing_command(self):
684
 
        self.get_branch_config('/b')
 
474
        self.get_location_config('/b')
685
475
        self.assertEqual("gnome-gpg", self.my_config.gpg_signing_command())
686
476
 
687
477
    def test_gpg_signing_command_missing(self):
688
 
        self.get_branch_config('/a')
 
478
        self.get_location_config('/a')
689
479
        self.assertEqual("false", self.my_config.gpg_signing_command())
690
480
 
691
481
    def test_get_user_option_global(self):
692
 
        self.get_branch_config('/a')
 
482
        self.get_location_config('/a')
693
483
        self.assertEqual('something',
694
484
                         self.my_config.get_user_option('user_global_option'))
695
485
 
696
486
    def test_get_user_option_local(self):
697
 
        self.get_branch_config('/a')
 
487
        self.get_location_config('/a')
698
488
        self.assertEqual('local',
699
489
                         self.my_config.get_user_option('user_local_option'))
700
 
 
701
 
    def test_get_user_option_appendpath(self):
702
 
        # returned as is for the base path:
703
 
        self.get_branch_config('http://www.example.com')
704
 
        self.assertEqual('append',
705
 
                         self.my_config.get_user_option('appendpath_option'))
706
 
        # Extra path components get appended:
707
 
        self.get_branch_config('http://www.example.com/a/b/c')
708
 
        self.assertEqual('append/a/b/c',
709
 
                         self.my_config.get_user_option('appendpath_option'))
710
 
        # Overriden for http://www.example.com/dir, where it is a
711
 
        # normal option:
712
 
        self.get_branch_config('http://www.example.com/dir/a/b/c')
713
 
        self.assertEqual('normal',
714
 
                         self.my_config.get_user_option('appendpath_option'))
715
 
 
716
 
    def test_get_user_option_norecurse(self):
717
 
        self.get_branch_config('http://www.example.com')
718
 
        self.assertEqual('norecurse',
719
 
                         self.my_config.get_user_option('norecurse_option'))
720
 
        self.get_branch_config('http://www.example.com/dir')
721
 
        self.assertEqual(None,
722
 
                         self.my_config.get_user_option('norecurse_option'))
723
 
        # http://www.example.com/norecurse is a recurse=False section
724
 
        # that redefines normal_option.  Subdirectories do not pick up
725
 
        # this redefinition.
726
 
        self.get_branch_config('http://www.example.com/norecurse')
727
 
        self.assertEqual('norecurse',
728
 
                         self.my_config.get_user_option('normal_option'))
729
 
        self.get_branch_config('http://www.example.com/norecurse/subdir')
730
 
        self.assertEqual('normal',
731
 
                         self.my_config.get_user_option('normal_option'))
732
 
 
733
 
    def test_set_user_option_norecurse(self):
734
 
        self.get_branch_config('http://www.example.com')
735
 
        self.my_config.set_user_option('foo', 'bar',
736
 
                                       store=config.STORE_LOCATION_NORECURSE)
737
 
        self.assertEqual(
738
 
            self.my_location_config._get_option_policy(
739
 
            'http://www.example.com', 'foo'),
740
 
            config.POLICY_NORECURSE)
741
 
 
742
 
    def test_set_user_option_appendpath(self):
743
 
        self.get_branch_config('http://www.example.com')
744
 
        self.my_config.set_user_option('foo', 'bar',
745
 
                                       store=config.STORE_LOCATION_APPENDPATH)
746
 
        self.assertEqual(
747
 
            self.my_location_config._get_option_policy(
748
 
            'http://www.example.com', 'foo'),
749
 
            config.POLICY_APPENDPATH)
750
 
 
751
 
    def test_set_user_option_change_policy(self):
752
 
        self.get_branch_config('http://www.example.com')
753
 
        self.my_config.set_user_option('norecurse_option', 'normal',
754
 
                                       store=config.STORE_LOCATION)
755
 
        self.assertEqual(
756
 
            self.my_location_config._get_option_policy(
757
 
            'http://www.example.com', 'norecurse_option'),
758
 
            config.POLICY_NONE)
759
 
 
760
 
    def test_set_user_option_recurse_false_section(self):
761
 
        # The following section has recurse=False set.  The test is to
762
 
        # make sure that a normal option can be added to the section,
763
 
        # converting recurse=False to the norecurse policy.
764
 
        self.get_branch_config('http://www.example.com/norecurse')
765
 
        self.callDeprecated(['The recurse option is deprecated as of 0.14.  '
766
 
                             'The section "http://www.example.com/norecurse" '
767
 
                             'has been converted to use policies.'],
768
 
                            self.my_config.set_user_option,
769
 
                            'foo', 'bar', store=config.STORE_LOCATION)
770
 
        self.assertEqual(
771
 
            self.my_location_config._get_option_policy(
772
 
            'http://www.example.com/norecurse', 'foo'),
773
 
            config.POLICY_NONE)
774
 
        # The previously existing option is still norecurse:
775
 
        self.assertEqual(
776
 
            self.my_location_config._get_option_policy(
777
 
            'http://www.example.com/norecurse', 'normal_option'),
778
 
            config.POLICY_NORECURSE)
779
490
        
780
 
 
781
491
    def test_post_commit_default(self):
782
 
        self.get_branch_config('/a/c')
783
 
        self.assertEqual('bzrlib.tests.test_config.post_commit',
 
492
        self.get_location_config('/a/c')
 
493
        self.assertEqual('bzrlib.selftest.testconfig.post_commit',
784
494
                         self.my_config.post_commit())
785
495
 
786
 
    def get_branch_config(self, location, global_config=None):
 
496
 
 
497
class TestLocationConfig(TestCaseInTempDir):
 
498
 
 
499
    def get_location_config(self, location, global_config=None):
787
500
        if global_config is None:
788
 
            global_file = StringIO(sample_config_text.encode('utf-8'))
 
501
            global_file = StringIO(sample_config_text)
789
502
        else:
790
 
            global_file = StringIO(global_config.encode('utf-8'))
791
 
        branches_file = StringIO(sample_branches_text.encode('utf-8'))
792
 
        self.my_config = config.BranchConfig(FakeBranch(location))
793
 
        # Force location config to use specified file
794
 
        self.my_location_config = self.my_config._get_location_config()
795
 
        self.my_location_config._get_parser(branches_file)
796
 
        # Force global config to use specified file
 
503
            global_file = StringIO(global_config)
 
504
        branches_file = StringIO(sample_branches_text)
 
505
        self.my_config = config.LocationConfig(location)
 
506
        self.my_config._get_parser(branches_file)
797
507
        self.my_config._get_global_config()._get_parser(global_file)
798
508
 
799
509
    def test_set_user_setting_sets_and_saves(self):
800
 
        self.get_branch_config('/a/c')
 
510
        # TODO RBC 20051029 test hat mkdir ~/.bazaar is called ..
 
511
        self.get_location_config('/a/c')
801
512
        record = InstrumentedConfigObj("foo")
802
 
        self.my_location_config._parser = record
803
 
 
804
 
        real_mkdir = os.mkdir
805
 
        self.created = False
806
 
        def checked_mkdir(path, mode=0777):
807
 
            self.log('making directory: %s', path)
808
 
            real_mkdir(path, mode)
809
 
            self.created = True
810
 
 
811
 
        os.mkdir = checked_mkdir
812
 
        try:
813
 
            self.callDeprecated(['The recurse option is deprecated as of '
814
 
                                 '0.14.  The section "/a/c" has been '
815
 
                                 'converted to use policies.'],
816
 
                                self.my_config.set_user_option,
817
 
                                'foo', 'bar', store=config.STORE_LOCATION)
818
 
        finally:
819
 
            os.mkdir = real_mkdir
820
 
 
821
 
        self.failUnless(self.created, 'Failed to create ~/.bazaar')
 
513
        self.my_config._parser = record
 
514
        return
 
515
        # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
516
        # broken: creates .bazaar in the top-level directory, not 
 
517
        # inside the test directory
 
518
        self.my_config.set_user_option('foo', 'bar')
822
519
        self.assertEqual([('__contains__', '/a/c'),
823
520
                          ('__contains__', '/a/c/'),
824
521
                          ('__setitem__', '/a/c', {}),
825
522
                          ('__getitem__', '/a/c'),
826
523
                          ('__setitem__', 'foo', 'bar'),
827
 
                          ('__getitem__', '/a/c'),
828
 
                          ('as_bool', 'recurse'),
829
 
                          ('__getitem__', '/a/c'),
830
 
                          ('__delitem__', 'recurse'),
831
 
                          ('__getitem__', '/a/c'),
832
 
                          ('keys',),
833
 
                          ('__getitem__', '/a/c'),
834
 
                          ('__contains__', 'foo:policy'),
835
524
                          ('write',)],
836
525
                         record._calls[1:])
837
526
 
838
 
    def test_set_user_setting_sets_and_saves2(self):
839
 
        self.get_branch_config('/a/c')
840
 
        self.assertIs(self.my_config.get_user_option('foo'), None)
841
 
        self.my_config.set_user_option('foo', 'bar')
842
 
        self.assertEqual(
843
 
            self.my_config.branch.control_files.files['branch.conf'], 
844
 
            'foo = bar')
845
 
        self.assertEqual(self.my_config.get_user_option('foo'), 'bar')
846
 
        self.my_config.set_user_option('foo', 'baz',
847
 
                                       store=config.STORE_LOCATION)
848
 
        self.assertEqual(self.my_config.get_user_option('foo'), 'baz')
849
 
        self.my_config.set_user_option('foo', 'qux')
850
 
        self.assertEqual(self.my_config.get_user_option('foo'), 'baz')
851
 
        
852
 
 
853
 
precedence_global = 'option = global'
854
 
precedence_branch = 'option = branch'
855
 
precedence_location = """
856
 
[http://]
857
 
recurse = true
858
 
option = recurse
859
 
[http://example.com/specific]
860
 
option = exact
861
 
"""
862
 
 
863
 
 
864
 
class TestBranchConfigItems(TestCaseInTempDir):
865
 
 
866
 
    def get_branch_config(self, global_config=None, location=None, 
867
 
                          location_config=None, branch_data_config=None):
868
 
        my_config = config.BranchConfig(FakeBranch(location))
869
 
        if global_config is not None:
870
 
            global_file = StringIO(global_config.encode('utf-8'))
871
 
            my_config._get_global_config()._get_parser(global_file)
872
 
        self.my_location_config = my_config._get_location_config()
873
 
        if location_config is not None:
874
 
            location_file = StringIO(location_config.encode('utf-8'))
875
 
            self.my_location_config._get_parser(location_file)
876
 
        if branch_data_config is not None:
877
 
            my_config.branch.control_files.files['branch.conf'] = \
878
 
                branch_data_config
879
 
        return my_config
 
527
 
 
528
class TestBranchConfigItems(TestCase):
880
529
 
881
530
    def test_user_id(self):
882
 
        branch = FakeBranch(user_id='Robert Collins <robertc@example.net>')
 
531
        branch = FakeBranch()
883
532
        my_config = config.BranchConfig(branch)
884
533
        self.assertEqual("Robert Collins <robertc@example.net>",
885
 
                         my_config.username())
886
 
        branch.control_files.email = "John"
887
 
        my_config.set_user_option('email', 
888
 
                                  "Robert Collins <robertc@example.org>")
889
 
        self.assertEqual("John", my_config.username())
890
 
        branch.control_files.email = None
891
 
        self.assertEqual("Robert Collins <robertc@example.org>",
892
 
                         my_config.username())
 
534
                         my_config._get_user_id())
 
535
        branch.email = "John"
 
536
        self.assertEqual("John", my_config._get_user_id())
893
537
 
894
538
    def test_not_set_in_branch(self):
895
 
        my_config = self.get_branch_config(sample_config_text)
896
 
        my_config.branch.control_files.email = None
897
 
        self.assertEqual(u"Erik B\u00e5gfors <erik@bagfors.nu>",
 
539
        branch = FakeBranch()
 
540
        my_config = config.BranchConfig(branch)
 
541
        branch.email = None
 
542
        config_file = StringIO(sample_config_text)
 
543
        (my_config._get_location_config().
 
544
            _get_global_config()._get_parser(config_file))
 
545
        self.assertEqual("Robert Collins <robertc@example.com>",
898
546
                         my_config._get_user_id())
899
 
        my_config.branch.control_files.email = "John"
 
547
        branch.email = "John"
900
548
        self.assertEqual("John", my_config._get_user_id())
901
549
 
902
 
    def test_BZR_EMAIL_OVERRIDES(self):
903
 
        os.environ['BZR_EMAIL'] = "Robert Collins <robertc@example.org>"
 
550
    def test_BZREMAIL_OVERRIDES(self):
 
551
        os.environ['BZREMAIL'] = "Robert Collins <robertc@example.org>"
904
552
        branch = FakeBranch()
905
553
        my_config = config.BranchConfig(branch)
906
554
        self.assertEqual("Robert Collins <robertc@example.org>",
907
555
                         my_config.username())
908
556
    
909
557
    def test_signatures_forced(self):
910
 
        my_config = self.get_branch_config(
911
 
            global_config=sample_always_signatures)
912
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
913
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
914
 
        self.assertTrue(my_config.signature_needed())
915
 
 
916
 
    def test_signatures_forced_branch(self):
917
 
        my_config = self.get_branch_config(
918
 
            global_config=sample_ignore_signatures,
919
 
            branch_data_config=sample_always_signatures)
920
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
921
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
922
 
        self.assertTrue(my_config.signature_needed())
 
558
        branch = FakeBranch()
 
559
        my_config = config.BranchConfig(branch)
 
560
        config_file = StringIO(sample_always_signatures)
 
561
        (my_config._get_location_config().
 
562
            _get_global_config()._get_parser(config_file))
 
563
        self.assertEqual(config.CHECK_ALWAYS, my_config.signature_checking())
923
564
 
924
565
    def test_gpg_signing_command(self):
925
 
        my_config = self.get_branch_config(
926
 
            # branch data cannot set gpg_signing_command
927
 
            branch_data_config="gpg_signing_command=pgp")
928
 
        config_file = StringIO(sample_config_text.encode('utf-8'))
929
 
        my_config._get_global_config()._get_parser(config_file)
 
566
        branch = FakeBranch()
 
567
        my_config = config.BranchConfig(branch)
 
568
        config_file = StringIO(sample_config_text)
 
569
        (my_config._get_location_config().
 
570
            _get_global_config()._get_parser(config_file))
930
571
        self.assertEqual('gnome-gpg', my_config.gpg_signing_command())
931
572
 
932
573
    def test_get_user_option_global(self):
933
574
        branch = FakeBranch()
934
575
        my_config = config.BranchConfig(branch)
935
 
        config_file = StringIO(sample_config_text.encode('utf-8'))
936
 
        (my_config._get_global_config()._get_parser(config_file))
 
576
        config_file = StringIO(sample_config_text)
 
577
        (my_config._get_location_config().
 
578
            _get_global_config()._get_parser(config_file))
937
579
        self.assertEqual('something',
938
580
                         my_config.get_user_option('user_global_option'))
939
581
 
940
582
    def test_post_commit_default(self):
941
583
        branch = FakeBranch()
942
 
        my_config = self.get_branch_config(sample_config_text, '/a/c',
943
 
                                           sample_branches_text)
944
 
        self.assertEqual(my_config.branch.base, '/a/c')
945
 
        self.assertEqual('bzrlib.tests.test_config.post_commit',
946
 
                         my_config.post_commit())
947
 
        my_config.set_user_option('post_commit', 'rmtree_root')
948
 
        # post-commit is ignored when bresent in branch data
949
 
        self.assertEqual('bzrlib.tests.test_config.post_commit',
950
 
                         my_config.post_commit())
951
 
        my_config.set_user_option('post_commit', 'rmtree_root',
952
 
                                  store=config.STORE_LOCATION)
953
 
        self.assertEqual('rmtree_root', my_config.post_commit())
954
 
 
955
 
    def test_config_precedence(self):
956
 
        my_config = self.get_branch_config(global_config=precedence_global)
957
 
        self.assertEqual(my_config.get_user_option('option'), 'global')
958
 
        my_config = self.get_branch_config(global_config=precedence_global, 
959
 
                                      branch_data_config=precedence_branch)
960
 
        self.assertEqual(my_config.get_user_option('option'), 'branch')
961
 
        my_config = self.get_branch_config(global_config=precedence_global, 
962
 
                                      branch_data_config=precedence_branch,
963
 
                                      location_config=precedence_location)
964
 
        self.assertEqual(my_config.get_user_option('option'), 'recurse')
965
 
        my_config = self.get_branch_config(global_config=precedence_global, 
966
 
                                      branch_data_config=precedence_branch,
967
 
                                      location_config=precedence_location,
968
 
                                      location='http://example.com/specific')
969
 
        self.assertEqual(my_config.get_user_option('option'), 'exact')
 
584
        branch.base='/a/c'
 
585
        my_config = config.BranchConfig(branch)
 
586
        config_file = StringIO(sample_config_text)
 
587
        (my_config._get_location_config().
 
588
            _get_global_config()._get_parser(config_file))
 
589
        branch_file = StringIO(sample_branches_text)
 
590
        my_config._get_location_config()._get_parser(branch_file)
 
591
        self.assertEqual('bzrlib.selftest.testconfig.post_commit',
 
592
                         my_config.post_commit())
970
593
 
971
594
 
972
595
class TestMailAddressExtraction(TestCase):
974
597
    def test_extract_email_address(self):
975
598
        self.assertEqual('jane@test.com',
976
599
                         config.extract_email_address('Jane <jane@test.com>'))
977
 
        self.assertRaises(errors.NoEmailInUsername,
 
600
        self.assertRaises(errors.BzrError,
978
601
                          config.extract_email_address, 'Jane Tester')