~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

  • Committer: Patch Queue Manager
  • Date: 2014-02-12 18:22:22 UTC
  • mfrom: (6589.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20140212182222-beouo25gaf1cny76
(vila) The XDG Base Directory Specification uses the XDG_CACHE_HOME,
 not XDG_CACHE_DIR. (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for finding and reading the bzr config file[s]."""
18
 
# import system imports here
 
18
 
19
19
from cStringIO import StringIO
 
20
from textwrap import dedent
20
21
import os
21
22
import sys
22
23
import threading
23
24
 
24
 
 
25
25
from testtools import matchers
26
26
 
27
 
#import bzrlib specific imports here
28
27
from bzrlib import (
29
28
    branch,
30
 
    bzrdir,
31
29
    config,
 
30
    controldir,
32
31
    diff,
33
32
    errors,
34
33
    osutils,
35
34
    mail_client,
36
 
    mergetools,
37
35
    ui,
38
36
    urlutils,
39
 
    registry,
 
37
    registry as _mod_registry,
40
38
    remote,
41
39
    tests,
42
40
    trace,
43
 
    transport,
44
41
    )
45
42
from bzrlib.symbol_versioning import (
46
43
    deprecated_in,
47
 
    deprecated_method,
48
44
    )
49
45
from bzrlib.transport import remote as transport_remote
50
46
from bzrlib.tests import (
71
67
 
72
68
# Register helpers to build stores
73
69
config.test_store_builder_registry.register(
74
 
    'configobj', lambda test: config.IniFileStore(test.get_transport(),
75
 
                                                  'configobj.conf'))
 
70
    'configobj', lambda test: config.TransportIniFileStore(
 
71
        test.get_transport(), 'configobj.conf'))
76
72
config.test_store_builder_registry.register(
77
73
    'bazaar', lambda test: config.GlobalStore())
78
74
config.test_store_builder_registry.register(
116
112
config.test_store_builder_registry.register('branch', build_branch_store)
117
113
 
118
114
 
 
115
def build_control_store(test):
 
116
    build_backing_branch(test, 'branch')
 
117
    b = controldir.ControlDir.open('branch')
 
118
    return config.ControlStore(b)
 
119
config.test_store_builder_registry.register('control', build_control_store)
 
120
 
 
121
 
119
122
def build_remote_branch_store(test):
120
123
    # There is only one permutation (but we won't be able to handle more with
121
124
    # this design anyway)
141
144
config.test_stack_builder_registry.register('branch', build_branch_stack)
142
145
 
143
146
 
144
 
def build_remote_branch_stack(test):
145
 
    # There is only one permutation (but we won't be able to handle more with
146
 
    # this design anyway)
147
 
    (transport_class,
148
 
     server_class) = transport_remote.get_test_permutations()[0]
149
 
    build_backing_branch(test, 'branch', transport_class, server_class)
150
 
    b = branch.Branch.open(test.get_url('branch'))
151
 
    return config.BranchStack(b)
152
 
config.test_stack_builder_registry.register('remote_branch',
153
 
                                            build_remote_branch_stack)
 
147
def build_branch_only_stack(test):
 
148
    # There is only one permutation (but we won't be able to handle more with
 
149
    # this design anyway)
 
150
    (transport_class,
 
151
     server_class) = transport_remote.get_test_permutations()[0]
 
152
    build_backing_branch(test, 'branch', transport_class, server_class)
 
153
    b = branch.Branch.open(test.get_url('branch'))
 
154
    return config.BranchOnlyStack(b)
 
155
config.test_stack_builder_registry.register('branch_only',
 
156
                                            build_branch_only_stack)
 
157
 
 
158
def build_remote_control_stack(test):
 
159
    # There is only one permutation (but we won't be able to handle more with
 
160
    # this design anyway)
 
161
    (transport_class,
 
162
     server_class) = transport_remote.get_test_permutations()[0]
 
163
    # We need only a bzrdir for this, not a full branch, but it's not worth
 
164
    # creating a dedicated helper to create only the bzrdir
 
165
    build_backing_branch(test, 'branch', transport_class, server_class)
 
166
    b = branch.Branch.open(test.get_url('branch'))
 
167
    return config.RemoteControlStack(b.bzrdir)
 
168
config.test_stack_builder_registry.register('remote_control',
 
169
                                            build_remote_control_stack)
154
170
 
155
171
 
156
172
sample_long_alias="log -r-15..-1 --line"
167
183
user_global_option=something
168
184
bzr.mergetool.sometool=sometool {base} {this} {other} -o {result}
169
185
bzr.mergetool.funkytool=funkytool "arg with spaces" {this_temp}
 
186
bzr.mergetool.newtool='"newtool with spaces" {this_temp}'
170
187
bzr.default_mergetool=sometool
171
188
[ALIASES]
172
189
h=help
311
328
 
312
329
class FakeBranch(object):
313
330
 
314
 
    def __init__(self, base=None, user_id=None):
 
331
    def __init__(self, base=None):
315
332
        if base is None:
316
333
            self.base = "http://example.com/branches/demo"
317
334
        else:
318
335
            self.base = base
319
336
        self._transport = self.control_files = \
320
 
            FakeControlFilesAndTransport(user_id=user_id)
 
337
            FakeControlFilesAndTransport()
321
338
 
322
339
    def _get_config(self):
323
340
        return config.TransportConfig(self._transport, 'branch.conf')
331
348
 
332
349
class FakeControlFilesAndTransport(object):
333
350
 
334
 
    def __init__(self, user_id=None):
 
351
    def __init__(self):
335
352
        self.files = {}
336
 
        if user_id:
337
 
            self.files['email'] = user_id
338
353
        self._transport = self
339
354
 
340
 
    def get_utf8(self, filename):
341
 
        # from LockableFiles
342
 
        raise AssertionError("get_utf8 should no longer be used")
343
 
 
344
355
    def get(self, filename):
345
356
        # from Transport
346
357
        try:
464
475
    def test_constructs(self):
465
476
        config.Config()
466
477
 
467
 
    def test_no_default_editor(self):
468
 
        self.assertRaises(
469
 
            NotImplementedError,
470
 
            self.applyDeprecated, deprecated_in((2, 4, 0)),
471
 
            config.Config().get_editor)
472
 
 
473
478
    def test_user_email(self):
474
479
        my_config = InstrumentedConfig()
475
480
        self.assertEqual('robert.collins@example.org', my_config.user_email())
483
488
 
484
489
    def test_signatures_default(self):
485
490
        my_config = config.Config()
486
 
        self.assertFalse(my_config.signature_needed())
 
491
        self.assertFalse(
 
492
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
493
                my_config.signature_needed))
487
494
        self.assertEqual(config.CHECK_IF_POSSIBLE,
488
 
                         my_config.signature_checking())
 
495
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
496
                my_config.signature_checking))
489
497
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
490
 
                         my_config.signing_policy())
 
498
                self.applyDeprecated(deprecated_in((2, 5, 0)),
 
499
                    my_config.signing_policy))
491
500
 
492
501
    def test_signatures_template_method(self):
493
502
        my_config = InstrumentedConfig()
494
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
 
503
        self.assertEqual(config.CHECK_NEVER,
 
504
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
505
                my_config.signature_checking))
495
506
        self.assertEqual(['_get_signature_checking'], my_config._calls)
496
507
 
497
508
    def test_signatures_template_method_none(self):
498
509
        my_config = InstrumentedConfig()
499
510
        my_config._signatures = None
500
511
        self.assertEqual(config.CHECK_IF_POSSIBLE,
501
 
                         my_config.signature_checking())
 
512
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
513
                             my_config.signature_checking))
502
514
        self.assertEqual(['_get_signature_checking'], my_config._calls)
503
515
 
504
516
    def test_gpg_signing_command_default(self):
505
517
        my_config = config.Config()
506
 
        self.assertEqual('gpg', my_config.gpg_signing_command())
 
518
        self.assertEqual('gpg',
 
519
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
520
                my_config.gpg_signing_command))
507
521
 
508
522
    def test_get_user_option_default(self):
509
523
        my_config = config.Config()
511
525
 
512
526
    def test_post_commit_default(self):
513
527
        my_config = config.Config()
514
 
        self.assertEqual(None, my_config.post_commit())
 
528
        self.assertEqual(None, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
529
                                                    my_config.post_commit))
 
530
 
515
531
 
516
532
    def test_log_format_default(self):
517
533
        my_config = config.Config()
518
 
        self.assertEqual('long', my_config.log_format())
 
534
        self.assertEqual('long',
 
535
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
536
                                              my_config.log_format))
519
537
 
520
538
    def test_acceptable_keys_default(self):
521
539
        my_config = config.Config()
522
 
        self.assertEqual(None, my_config.acceptable_keys())
 
540
        self.assertEqual(None, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
541
            my_config.acceptable_keys))
523
542
 
524
543
    def test_validate_signatures_in_log_default(self):
525
544
        my_config = config.Config()
539
558
    def setUp(self):
540
559
        super(TestConfigPath, self).setUp()
541
560
        self.overrideEnv('HOME', '/home/bogus')
542
 
        self.overrideEnv('XDG_CACHE_DIR', '')
 
561
        self.overrideEnv('XDG_CACHE_HOME', '')
543
562
        if sys.platform == 'win32':
544
563
            self.overrideEnv(
545
564
                'BZR_HOME', r'C:\Documents and Settings\bogus\Application Data')
551
570
    def test_config_dir(self):
552
571
        self.assertEqual(config.config_dir(), self.bzr_home)
553
572
 
 
573
    def test_config_dir_is_unicode(self):
 
574
        self.assertIsInstance(config.config_dir(), unicode)
 
575
 
554
576
    def test_config_filename(self):
555
577
        self.assertEqual(config.config_filename(),
556
578
                         self.bzr_home + '/bazaar.conf')
606
628
class TestIniConfigBuilding(TestIniConfig):
607
629
 
608
630
    def test_contructs(self):
609
 
        my_config = config.IniBasedConfig()
 
631
        config.IniBasedConfig()
610
632
 
611
633
    def test_from_fp(self):
612
634
        my_config = config.IniBasedConfig.from_string(sample_config_text)
655
677
 
656
678
    def test_saved_with_content(self):
657
679
        content = 'foo = bar\n'
658
 
        conf = config.IniBasedConfig.from_string(
659
 
            content, file_name='./test.conf', save=True)
 
680
        config.IniBasedConfig.from_string(content, file_name='./test.conf',
 
681
                                          save=True)
660
682
        self.assertFileEqual(content, 'test.conf')
661
683
 
662
684
 
663
 
class TestIniConfigOptionExpansionDefaultValue(tests.TestCaseInTempDir):
664
 
    """What is the default value of expand for config options.
665
 
 
666
 
    This is an opt-in beta feature used to evaluate whether or not option
667
 
    references can appear in dangerous place raising exceptions, disapearing
668
 
    (and as such corrupting data) or if it's safe to activate the option by
669
 
    default.
670
 
 
671
 
    Note that these tests relies on config._expand_default_value being already
672
 
    overwritten in the parent class setUp.
673
 
    """
674
 
 
675
 
    def setUp(self):
676
 
        super(TestIniConfigOptionExpansionDefaultValue, self).setUp()
677
 
        self.config = None
678
 
        self.warnings = []
679
 
        def warning(*args):
680
 
            self.warnings.append(args[0] % args[1:])
681
 
        self.overrideAttr(trace, 'warning', warning)
682
 
 
683
 
    def get_config(self, expand):
684
 
        c = config.GlobalConfig.from_string('bzr.config.expand=%s' % (expand,),
685
 
                                            save=True)
686
 
        return c
687
 
 
688
 
    def assertExpandIs(self, expected):
689
 
        actual = config._get_expand_default_value()
690
 
        #self.config.get_user_option_as_bool('bzr.config.expand')
691
 
        self.assertEquals(expected, actual)
692
 
 
693
 
    def test_default_is_None(self):
694
 
        self.assertEquals(None, config._expand_default_value)
695
 
 
696
 
    def test_default_is_False_even_if_None(self):
697
 
        self.config = self.get_config(None)
698
 
        self.assertExpandIs(False)
699
 
 
700
 
    def test_default_is_False_even_if_invalid(self):
701
 
        self.config = self.get_config('<your choice>')
702
 
        self.assertExpandIs(False)
703
 
        # ...
704
 
        # Huh ? My choice is False ? Thanks, always happy to hear that :D
705
 
        # Wait, you've been warned !
706
 
        self.assertLength(1, self.warnings)
707
 
        self.assertEquals(
708
 
            'Value "<your choice>" is not a boolean for "bzr.config.expand"',
709
 
            self.warnings[0])
710
 
 
711
 
    def test_default_is_True(self):
712
 
        self.config = self.get_config(True)
713
 
        self.assertExpandIs(True)
714
 
 
715
 
    def test_default_is_False(self):
716
 
        self.config = self.get_config(False)
717
 
        self.assertExpandIs(False)
718
 
 
719
 
 
720
685
class TestIniConfigOptionExpansion(tests.TestCase):
721
686
    """Test option expansion from the IniConfig level.
722
687
 
819
784
        self.assertEquals(['{foo', '}', '{', 'bar}'],
820
785
                          conf.get_user_option('hidden', expand=True))
821
786
 
 
787
 
822
788
class TestLocationConfigOptionExpansion(tests.TestCaseInTempDir):
823
789
 
824
790
    def get_config(self, location, string=None):
1035
1001
        # automatically cast to list
1036
1002
        self.assertEqual(['x'], get_list('one_item'))
1037
1003
 
 
1004
    def test_get_user_option_as_int_from_SI(self):
 
1005
        conf, parser = self.make_config_parser("""
 
1006
plain = 100
 
1007
si_k = 5k,
 
1008
si_kb = 5kb,
 
1009
si_m = 5M,
 
1010
si_mb = 5MB,
 
1011
si_g = 5g,
 
1012
si_gb = 5gB,
 
1013
""")
 
1014
        def get_si(s, default=None):
 
1015
            return self.applyDeprecated(
 
1016
                deprecated_in((2, 5, 0)),
 
1017
                conf.get_user_option_as_int_from_SI, s, default)
 
1018
        self.assertEqual(100, get_si('plain'))
 
1019
        self.assertEqual(5000, get_si('si_k'))
 
1020
        self.assertEqual(5000, get_si('si_kb'))
 
1021
        self.assertEqual(5000000, get_si('si_m'))
 
1022
        self.assertEqual(5000000, get_si('si_mb'))
 
1023
        self.assertEqual(5000000000, get_si('si_g'))
 
1024
        self.assertEqual(5000000000, get_si('si_gb'))
 
1025
        self.assertEqual(None, get_si('non-exist'))
 
1026
        self.assertEqual(42, get_si('non-exist-with-default',  42))
 
1027
 
1038
1028
 
1039
1029
class TestSupressWarning(TestIniConfig):
1040
1030
 
1056
1046
class TestGetConfig(tests.TestCase):
1057
1047
 
1058
1048
    def test_constructs(self):
1059
 
        my_config = config.GlobalConfig()
 
1049
        config.GlobalConfig()
1060
1050
 
1061
1051
    def test_calls_read_filenames(self):
1062
1052
        # replace the class that is constructed, to check its parameters
1074
1064
 
1075
1065
class TestBranchConfig(tests.TestCaseWithTransport):
1076
1066
 
1077
 
    def test_constructs(self):
 
1067
    def test_constructs_valid(self):
1078
1068
        branch = FakeBranch()
1079
1069
        my_config = config.BranchConfig(branch)
 
1070
        self.assertIsNot(None, my_config)
 
1071
 
 
1072
    def test_constructs_error(self):
1080
1073
        self.assertRaises(TypeError, config.BranchConfig)
1081
1074
 
1082
1075
    def test_get_location_config(self):
1088
1081
 
1089
1082
    def test_get_config(self):
1090
1083
        """The Branch.get_config method works properly"""
1091
 
        b = bzrdir.BzrDir.create_standalone_workingtree('.').branch
 
1084
        b = controldir.ControlDir.create_standalone_workingtree('.').branch
1092
1085
        my_config = b.get_config()
1093
1086
        self.assertIs(my_config.get_user_option('wacky'), None)
1094
1087
        my_config.set_user_option('wacky', 'unlikely')
1114
1107
        conf = config.LocationConfig.from_string(
1115
1108
            '[%s]\nnickname = foobar' % (local_url,),
1116
1109
            local_url, save=True)
 
1110
        self.assertIsNot(None, conf)
1117
1111
        self.assertEqual('foobar', branch.nick)
1118
1112
 
1119
1113
    def test_config_local_path(self):
1122
1116
        self.assertEqual('branch', branch.nick)
1123
1117
 
1124
1118
        local_path = osutils.getcwd().encode('utf8')
1125
 
        conf = config.LocationConfig.from_string(
 
1119
        config.LocationConfig.from_string(
1126
1120
            '[%s/branch]\nnickname = barry' % (local_path,),
1127
1121
            'branch',  save=True)
 
1122
        # Now the branch will find its nick via the location config
1128
1123
        self.assertEqual('barry', branch.nick)
1129
1124
 
1130
1125
    def test_config_creates_local(self):
1143
1138
        b = self.make_branch('!repo')
1144
1139
        self.assertEqual('!repo', b.get_config().get_nickname())
1145
1140
 
 
1141
    def test_autonick_uses_branch_name(self):
 
1142
        b = self.make_branch('foo', name='bar')
 
1143
        self.assertEqual('bar', b.get_config().get_nickname())
 
1144
 
1146
1145
    def test_warn_if_masked(self):
1147
1146
        warnings = []
1148
1147
        def warning(*args):
1188
1187
        my_config = config.GlobalConfig()
1189
1188
        self.assertEqual(None, my_config._get_user_id())
1190
1189
 
1191
 
    def test_configured_editor(self):
1192
 
        my_config = config.GlobalConfig.from_string(sample_config_text)
1193
 
        editor = self.applyDeprecated(
1194
 
            deprecated_in((2, 4, 0)), my_config.get_editor)
1195
 
        self.assertEqual('vim', editor)
1196
 
 
1197
1190
    def test_signatures_always(self):
1198
1191
        my_config = config.GlobalConfig.from_string(sample_always_signatures)
1199
1192
        self.assertEqual(config.CHECK_NEVER,
1200
 
                         my_config.signature_checking())
 
1193
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1194
                             my_config.signature_checking))
1201
1195
        self.assertEqual(config.SIGN_ALWAYS,
1202
 
                         my_config.signing_policy())
1203
 
        self.assertEqual(True, my_config.signature_needed())
 
1196
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1197
                             my_config.signing_policy))
 
1198
        self.assertEqual(True,
 
1199
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1200
                my_config.signature_needed))
1204
1201
 
1205
1202
    def test_signatures_if_possible(self):
1206
1203
        my_config = config.GlobalConfig.from_string(sample_maybe_signatures)
1207
1204
        self.assertEqual(config.CHECK_NEVER,
1208
 
                         my_config.signature_checking())
 
1205
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1206
                             my_config.signature_checking))
1209
1207
        self.assertEqual(config.SIGN_WHEN_REQUIRED,
1210
 
                         my_config.signing_policy())
1211
 
        self.assertEqual(False, my_config.signature_needed())
 
1208
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1209
                             my_config.signing_policy))
 
1210
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1211
            my_config.signature_needed))
1212
1212
 
1213
1213
    def test_signatures_ignore(self):
1214
1214
        my_config = config.GlobalConfig.from_string(sample_ignore_signatures)
1215
1215
        self.assertEqual(config.CHECK_ALWAYS,
1216
 
                         my_config.signature_checking())
 
1216
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1217
                             my_config.signature_checking))
1217
1218
        self.assertEqual(config.SIGN_NEVER,
1218
 
                         my_config.signing_policy())
1219
 
        self.assertEqual(False, my_config.signature_needed())
 
1219
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1220
                             my_config.signing_policy))
 
1221
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1222
            my_config.signature_needed))
1220
1223
 
1221
1224
    def _get_sample_config(self):
1222
1225
        my_config = config.GlobalConfig.from_string(sample_config_text)
1224
1227
 
1225
1228
    def test_gpg_signing_command(self):
1226
1229
        my_config = self._get_sample_config()
1227
 
        self.assertEqual("gnome-gpg", my_config.gpg_signing_command())
1228
 
        self.assertEqual(False, my_config.signature_needed())
 
1230
        self.assertEqual("gnome-gpg",
 
1231
            self.applyDeprecated(
 
1232
                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
 
1233
        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1234
            my_config.signature_needed))
1229
1235
 
1230
1236
    def test_gpg_signing_key(self):
1231
1237
        my_config = self._get_sample_config()
1232
 
        self.assertEqual("DD4D5088", my_config.gpg_signing_key())
 
1238
        self.assertEqual("DD4D5088",
 
1239
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1240
                my_config.gpg_signing_key))
1233
1241
 
1234
1242
    def _get_empty_config(self):
1235
1243
        my_config = config.GlobalConfig()
1237
1245
 
1238
1246
    def test_gpg_signing_command_unset(self):
1239
1247
        my_config = self._get_empty_config()
1240
 
        self.assertEqual("gpg", my_config.gpg_signing_command())
 
1248
        self.assertEqual("gpg",
 
1249
            self.applyDeprecated(
 
1250
                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
1241
1251
 
1242
1252
    def test_get_user_option_default(self):
1243
1253
        my_config = self._get_empty_config()
1250
1260
 
1251
1261
    def test_post_commit_default(self):
1252
1262
        my_config = self._get_sample_config()
1253
 
        self.assertEqual(None, my_config.post_commit())
 
1263
        self.assertEqual(None,
 
1264
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1265
                                              my_config.post_commit))
1254
1266
 
1255
1267
    def test_configured_logformat(self):
1256
1268
        my_config = self._get_sample_config()
1257
 
        self.assertEqual("short", my_config.log_format())
 
1269
        self.assertEqual("short",
 
1270
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1271
                                              my_config.log_format))
1258
1272
 
1259
1273
    def test_configured_acceptable_keys(self):
1260
1274
        my_config = self._get_sample_config()
1261
 
        self.assertEqual("amy", my_config.acceptable_keys())
 
1275
        self.assertEqual("amy",
 
1276
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1277
                my_config.acceptable_keys))
1262
1278
 
1263
1279
    def test_configured_validate_signatures_in_log(self):
1264
1280
        my_config = self._get_sample_config()
1302
1318
        self.log(repr(tools))
1303
1319
        self.assertEqual(
1304
1320
            {u'funkytool' : u'funkytool "arg with spaces" {this_temp}',
1305
 
            u'sometool' : u'sometool {base} {this} {other} -o {result}'},
 
1321
            u'sometool' : u'sometool {base} {this} {other} -o {result}',
 
1322
            u'newtool' : u'"newtool with spaces" {this_temp}'},
1306
1323
            tools)
1307
1324
 
1308
1325
    def test_get_merge_tools_empty(self):
1356
1373
 
1357
1374
class TestLocationConfig(tests.TestCaseInTempDir, TestOptionsMixin):
1358
1375
 
1359
 
    def test_constructs(self):
1360
 
        my_config = config.LocationConfig('http://example.com')
 
1376
    def test_constructs_valid(self):
 
1377
        config.LocationConfig('http://example.com')
 
1378
 
 
1379
    def test_constructs_error(self):
1361
1380
        self.assertRaises(TypeError, config.LocationConfig)
1362
1381
 
1363
1382
    def test_branch_calls_read_filenames(self):
1499
1518
        self.get_branch_config('http://www.example.com',
1500
1519
                                 global_config=sample_ignore_signatures)
1501
1520
        self.assertEqual(config.CHECK_ALWAYS,
1502
 
                         self.my_config.signature_checking())
 
1521
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1522
                             self.my_config.signature_checking))
1503
1523
        self.assertEqual(config.SIGN_NEVER,
1504
 
                         self.my_config.signing_policy())
 
1524
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1525
                             self.my_config.signing_policy))
1505
1526
 
1506
1527
    def test_signatures_never(self):
1507
1528
        self.get_branch_config('/a/c')
1508
1529
        self.assertEqual(config.CHECK_NEVER,
1509
 
                         self.my_config.signature_checking())
 
1530
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1531
                             self.my_config.signature_checking))
1510
1532
 
1511
1533
    def test_signatures_when_available(self):
1512
1534
        self.get_branch_config('/a/', global_config=sample_ignore_signatures)
1513
1535
        self.assertEqual(config.CHECK_IF_POSSIBLE,
1514
 
                         self.my_config.signature_checking())
 
1536
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1537
                             self.my_config.signature_checking))
1515
1538
 
1516
1539
    def test_signatures_always(self):
1517
1540
        self.get_branch_config('/b')
1518
1541
        self.assertEqual(config.CHECK_ALWAYS,
1519
 
                         self.my_config.signature_checking())
 
1542
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1543
                         self.my_config.signature_checking))
1520
1544
 
1521
1545
    def test_gpg_signing_command(self):
1522
1546
        self.get_branch_config('/b')
1523
 
        self.assertEqual("gnome-gpg", self.my_config.gpg_signing_command())
 
1547
        self.assertEqual("gnome-gpg",
 
1548
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1549
                self.my_config.gpg_signing_command))
1524
1550
 
1525
1551
    def test_gpg_signing_command_missing(self):
1526
1552
        self.get_branch_config('/a')
1527
 
        self.assertEqual("false", self.my_config.gpg_signing_command())
 
1553
        self.assertEqual("false",
 
1554
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1555
                self.my_config.gpg_signing_command))
1528
1556
 
1529
1557
    def test_gpg_signing_key(self):
1530
1558
        self.get_branch_config('/b')
1531
 
        self.assertEqual("DD4D5088", self.my_config.gpg_signing_key())
 
1559
        self.assertEqual("DD4D5088", self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1560
            self.my_config.gpg_signing_key))
1532
1561
 
1533
1562
    def test_gpg_signing_key_default(self):
1534
1563
        self.get_branch_config('/a')
1535
 
        self.assertEqual("erik@bagfors.nu", self.my_config.gpg_signing_key())
 
1564
        self.assertEqual("erik@bagfors.nu",
 
1565
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1566
                self.my_config.gpg_signing_key))
1536
1567
 
1537
1568
    def test_get_user_option_global(self):
1538
1569
        self.get_branch_config('/a')
1626
1657
    def test_post_commit_default(self):
1627
1658
        self.get_branch_config('/a/c')
1628
1659
        self.assertEqual('bzrlib.tests.test_config.post_commit',
1629
 
                         self.my_config.post_commit())
 
1660
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1661
                                              self.my_config.post_commit))
1630
1662
 
1631
1663
    def get_branch_config(self, location, global_config=None,
1632
1664
                          location_config=None):
1636
1668
        if location_config is None:
1637
1669
            location_config = sample_branches_text
1638
1670
 
1639
 
        my_global_config = config.GlobalConfig.from_string(global_config,
1640
 
                                                           save=True)
1641
 
        my_location_config = config.LocationConfig.from_string(
1642
 
            location_config, my_branch.base, save=True)
 
1671
        config.GlobalConfig.from_string(global_config, save=True)
 
1672
        config.LocationConfig.from_string(location_config, my_branch.base,
 
1673
                                          save=True)
1643
1674
        my_config = config.BranchConfig(my_branch)
1644
1675
        self.my_config = my_config
1645
1676
        self.my_location_config = my_config._get_location_config()
1710
1741
                          location_config=None, branch_data_config=None):
1711
1742
        my_branch = FakeBranch(location)
1712
1743
        if global_config is not None:
1713
 
            my_global_config = config.GlobalConfig.from_string(global_config,
1714
 
                                                               save=True)
 
1744
            config.GlobalConfig.from_string(global_config, save=True)
1715
1745
        if location_config is not None:
1716
 
            my_location_config = config.LocationConfig.from_string(
1717
 
                location_config, my_branch.base, save=True)
 
1746
            config.LocationConfig.from_string(location_config, my_branch.base,
 
1747
                                              save=True)
1718
1748
        my_config = config.BranchConfig(my_branch)
1719
1749
        if branch_data_config is not None:
1720
1750
            my_config.branch.control_files.files['branch.conf'] = \
1722
1752
        return my_config
1723
1753
 
1724
1754
    def test_user_id(self):
1725
 
        branch = FakeBranch(user_id='Robert Collins <robertc@example.net>')
 
1755
        branch = FakeBranch()
1726
1756
        my_config = config.BranchConfig(branch)
1727
 
        self.assertEqual("Robert Collins <robertc@example.net>",
1728
 
                         my_config.username())
 
1757
        self.assertIsNot(None, my_config.username())
1729
1758
        my_config.branch.control_files.files['email'] = "John"
1730
1759
        my_config.set_user_option('email',
1731
1760
                                  "Robert Collins <robertc@example.org>")
1732
 
        self.assertEqual("John", my_config.username())
1733
 
        del my_config.branch.control_files.files['email']
1734
1761
        self.assertEqual("Robert Collins <robertc@example.org>",
1735
 
                         my_config.username())
1736
 
 
1737
 
    def test_not_set_in_branch(self):
1738
 
        my_config = self.get_branch_config(global_config=sample_config_text)
1739
 
        self.assertEqual(u"Erik B\u00e5gfors <erik@bagfors.nu>",
1740
 
                         my_config._get_user_id())
1741
 
        my_config.branch.control_files.files['email'] = "John"
1742
 
        self.assertEqual("John", my_config._get_user_id())
 
1762
                        my_config.username())
1743
1763
 
1744
1764
    def test_BZR_EMAIL_OVERRIDES(self):
1745
1765
        self.overrideEnv('BZR_EMAIL', "Robert Collins <robertc@example.org>")
1751
1771
    def test_signatures_forced(self):
1752
1772
        my_config = self.get_branch_config(
1753
1773
            global_config=sample_always_signatures)
1754
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
1755
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
1756
 
        self.assertTrue(my_config.signature_needed())
 
1774
        self.assertEqual(config.CHECK_NEVER,
 
1775
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1776
                my_config.signature_checking))
 
1777
        self.assertEqual(config.SIGN_ALWAYS,
 
1778
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1779
                my_config.signing_policy))
 
1780
        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1781
            my_config.signature_needed))
1757
1782
 
1758
1783
    def test_signatures_forced_branch(self):
1759
1784
        my_config = self.get_branch_config(
1760
1785
            global_config=sample_ignore_signatures,
1761
1786
            branch_data_config=sample_always_signatures)
1762
 
        self.assertEqual(config.CHECK_NEVER, my_config.signature_checking())
1763
 
        self.assertEqual(config.SIGN_ALWAYS, my_config.signing_policy())
1764
 
        self.assertTrue(my_config.signature_needed())
 
1787
        self.assertEqual(config.CHECK_NEVER,
 
1788
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1789
                my_config.signature_checking))
 
1790
        self.assertEqual(config.SIGN_ALWAYS,
 
1791
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1792
                my_config.signing_policy))
 
1793
        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1794
            my_config.signature_needed))
1765
1795
 
1766
1796
    def test_gpg_signing_command(self):
1767
1797
        my_config = self.get_branch_config(
1768
1798
            global_config=sample_config_text,
1769
1799
            # branch data cannot set gpg_signing_command
1770
1800
            branch_data_config="gpg_signing_command=pgp")
1771
 
        self.assertEqual('gnome-gpg', my_config.gpg_signing_command())
 
1801
        self.assertEqual('gnome-gpg',
 
1802
            self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1803
                my_config.gpg_signing_command))
1772
1804
 
1773
1805
    def test_get_user_option_global(self):
1774
1806
        my_config = self.get_branch_config(global_config=sample_config_text)
1781
1813
                                      location_config=sample_branches_text)
1782
1814
        self.assertEqual(my_config.branch.base, '/a/c')
1783
1815
        self.assertEqual('bzrlib.tests.test_config.post_commit',
1784
 
                         my_config.post_commit())
 
1816
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1817
                                              my_config.post_commit))
1785
1818
        my_config.set_user_option('post_commit', 'rmtree_root')
1786
1819
        # post-commit is ignored when present in branch data
1787
1820
        self.assertEqual('bzrlib.tests.test_config.post_commit',
1788
 
                         my_config.post_commit())
 
1821
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1822
                                              my_config.post_commit))
1789
1823
        my_config.set_user_option('post_commit', 'rmtree_root',
1790
1824
                                  store=config.STORE_LOCATION)
1791
 
        self.assertEqual('rmtree_root', my_config.post_commit())
 
1825
        self.assertEqual('rmtree_root',
 
1826
                         self.applyDeprecated(deprecated_in((2, 5, 0)),
 
1827
                                              my_config.post_commit))
1792
1828
 
1793
1829
    def test_config_precedence(self):
1794
1830
        # FIXME: eager test, luckily no persitent config file makes it fail
1810
1846
            location='http://example.com/specific')
1811
1847
        self.assertEqual(my_config.get_user_option('option'), 'exact')
1812
1848
 
1813
 
    def test_get_mail_client(self):
1814
 
        config = self.get_branch_config()
1815
 
        client = config.get_mail_client()
1816
 
        self.assertIsInstance(client, mail_client.DefaultMail)
1817
 
 
1818
 
        # Specific clients
1819
 
        config.set_user_option('mail_client', 'evolution')
1820
 
        client = config.get_mail_client()
1821
 
        self.assertIsInstance(client, mail_client.Evolution)
1822
 
 
1823
 
        config.set_user_option('mail_client', 'kmail')
1824
 
        client = config.get_mail_client()
1825
 
        self.assertIsInstance(client, mail_client.KMail)
1826
 
 
1827
 
        config.set_user_option('mail_client', 'mutt')
1828
 
        client = config.get_mail_client()
1829
 
        self.assertIsInstance(client, mail_client.Mutt)
1830
 
 
1831
 
        config.set_user_option('mail_client', 'thunderbird')
1832
 
        client = config.get_mail_client()
1833
 
        self.assertIsInstance(client, mail_client.Thunderbird)
1834
 
 
1835
 
        # Generic options
1836
 
        config.set_user_option('mail_client', 'default')
1837
 
        client = config.get_mail_client()
1838
 
        self.assertIsInstance(client, mail_client.DefaultMail)
1839
 
 
1840
 
        config.set_user_option('mail_client', 'editor')
1841
 
        client = config.get_mail_client()
1842
 
        self.assertIsInstance(client, mail_client.Editor)
1843
 
 
1844
 
        config.set_user_option('mail_client', 'mapi')
1845
 
        client = config.get_mail_client()
1846
 
        self.assertIsInstance(client, mail_client.MAPIClient)
1847
 
 
1848
 
        config.set_user_option('mail_client', 'xdg-email')
1849
 
        client = config.get_mail_client()
1850
 
        self.assertIsInstance(client, mail_client.XDGEmail)
1851
 
 
1852
 
        config.set_user_option('mail_client', 'firebird')
1853
 
        self.assertRaises(errors.UnknownMailClient, config.get_mail_client)
1854
 
 
1855
1849
 
1856
1850
class TestMailAddressExtraction(tests.TestCase):
1857
1851
 
1928
1922
        conf = config.TransportConfig(t, 'foo.conf')
1929
1923
        self.assertRaises(errors.ParseConfigError, conf._get_configobj)
1930
1924
 
 
1925
    def test_load_permission_denied(self):
 
1926
        """Ensure we get an empty config file if the file is inaccessible."""
 
1927
        warnings = []
 
1928
        def warning(*args):
 
1929
            warnings.append(args[0] % args[1:])
 
1930
        self.overrideAttr(trace, 'warning', warning)
 
1931
 
 
1932
        class DenyingTransport(object):
 
1933
 
 
1934
            def __init__(self, base):
 
1935
                self.base = base
 
1936
 
 
1937
            def get_bytes(self, relpath):
 
1938
                raise errors.PermissionDenied(relpath, "")
 
1939
 
 
1940
        cfg = config.TransportConfig(
 
1941
            DenyingTransport("nonexisting://"), 'control.conf')
 
1942
        self.assertIs(None, cfg.get_option('non-existant', 'SECTION'))
 
1943
        self.assertEquals(
 
1944
            warnings,
 
1945
            [u'Permission denied while trying to open configuration file '
 
1946
             u'nonexisting:///control.conf.'])
 
1947
 
1931
1948
    def test_get_value(self):
1932
1949
        """Test that retreiving a value from a section is possible"""
1933
1950
        bzrdir_config = config.TransportConfig(self.get_transport('.'),
2121
2138
        self.assertGetHook(remote_branch._get_config(), 'file', 'branch')
2122
2139
 
2123
2140
    def test_get_hook_remote_bzrdir(self):
2124
 
        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
 
2141
        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
2125
2142
        conf = remote_bzrdir._get_config()
2126
2143
        conf.set_option('remotedir', 'file')
2127
2144
        self.assertGetHook(conf, 'file', 'remotedir')
2149
2166
    def test_set_hook_remote_bzrdir(self):
2150
2167
        remote_branch = branch.Branch.open(self.get_url('tree'))
2151
2168
        self.addCleanup(remote_branch.lock_write().unlock)
2152
 
        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
 
2169
        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
2153
2170
        self.assertSetHook(remote_bzrdir._get_config(), 'file', 'remotedir')
2154
2171
 
2155
2172
    def assertLoadHook(self, expected_nb_calls, name, conf_class, *conf_args):
2172
2189
        self.assertLoadHook(1, 'file', remote.RemoteBranchConfig, remote_branch)
2173
2190
 
2174
2191
    def test_load_hook_remote_bzrdir(self):
2175
 
        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
 
2192
        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
2176
2193
        # The config file doesn't exist, set an option to force its creation
2177
2194
        conf = remote_bzrdir._get_config()
2178
2195
        conf.set_option('remotedir', 'file')
2203
2220
    def test_save_hook_remote_bzrdir(self):
2204
2221
        remote_branch = branch.Branch.open(self.get_url('tree'))
2205
2222
        self.addCleanup(remote_branch.lock_write().unlock)
2206
 
        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
 
2223
        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
2207
2224
        self.assertSaveHook(remote_bzrdir._get_config())
2208
2225
 
2209
2226
 
 
2227
class TestOptionNames(tests.TestCase):
 
2228
 
 
2229
    def is_valid(self, name):
 
2230
        return config._option_ref_re.match('{%s}' % name) is not None
 
2231
 
 
2232
    def test_valid_names(self):
 
2233
        self.assertTrue(self.is_valid('foo'))
 
2234
        self.assertTrue(self.is_valid('foo.bar'))
 
2235
        self.assertTrue(self.is_valid('f1'))
 
2236
        self.assertTrue(self.is_valid('_'))
 
2237
        self.assertTrue(self.is_valid('__bar__'))
 
2238
        self.assertTrue(self.is_valid('a_'))
 
2239
        self.assertTrue(self.is_valid('a1'))
 
2240
 
 
2241
    def test_invalid_names(self):
 
2242
        self.assertFalse(self.is_valid(' foo'))
 
2243
        self.assertFalse(self.is_valid('foo '))
 
2244
        self.assertFalse(self.is_valid('1'))
 
2245
        self.assertFalse(self.is_valid('1,2'))
 
2246
        self.assertFalse(self.is_valid('foo$'))
 
2247
        self.assertFalse(self.is_valid('!foo'))
 
2248
        self.assertFalse(self.is_valid('foo.'))
 
2249
        self.assertFalse(self.is_valid('foo..bar'))
 
2250
        self.assertFalse(self.is_valid('{}'))
 
2251
        self.assertFalse(self.is_valid('{a}'))
 
2252
        self.assertFalse(self.is_valid('a\n'))
 
2253
 
 
2254
    def assertSingleGroup(self, reference):
 
2255
        # the regexp is used with split and as such should match the reference
 
2256
        # *only*, if more groups needs to be defined, (?:...) should be used.
 
2257
        m = config._option_ref_re.match('{a}')
 
2258
        self.assertLength(1, m.groups())
 
2259
 
 
2260
    def test_valid_references(self):
 
2261
        self.assertSingleGroup('{a}')
 
2262
        self.assertSingleGroup('{{a}}')
 
2263
 
 
2264
 
2210
2265
class TestOption(tests.TestCase):
2211
2266
 
2212
2267
    def test_default_value(self):
2213
2268
        opt = config.Option('foo', default='bar')
2214
2269
        self.assertEquals('bar', opt.get_default())
2215
2270
 
 
2271
    def test_callable_default_value(self):
 
2272
        def bar_as_unicode():
 
2273
            return u'bar'
 
2274
        opt = config.Option('foo', default=bar_as_unicode)
 
2275
        self.assertEquals('bar', opt.get_default())
 
2276
 
 
2277
    def test_default_value_from_env(self):
 
2278
        opt = config.Option('foo', default='bar', default_from_env=['FOO'])
 
2279
        self.overrideEnv('FOO', 'quux')
 
2280
        # Env variable provides a default taking over the option one
 
2281
        self.assertEquals('quux', opt.get_default())
 
2282
 
 
2283
    def test_first_default_value_from_env_wins(self):
 
2284
        opt = config.Option('foo', default='bar',
 
2285
                            default_from_env=['NO_VALUE', 'FOO', 'BAZ'])
 
2286
        self.overrideEnv('FOO', 'foo')
 
2287
        self.overrideEnv('BAZ', 'baz')
 
2288
        # The first env var set wins
 
2289
        self.assertEquals('foo', opt.get_default())
 
2290
 
 
2291
    def test_not_supported_list_default_value(self):
 
2292
        self.assertRaises(AssertionError, config.Option, 'foo', default=[1])
 
2293
 
 
2294
    def test_not_supported_object_default_value(self):
 
2295
        self.assertRaises(AssertionError, config.Option, 'foo',
 
2296
                          default=object())
 
2297
 
 
2298
    def test_not_supported_callable_default_value_not_unicode(self):
 
2299
        def bar_not_unicode():
 
2300
            return 'bar'
 
2301
        opt = config.Option('foo', default=bar_not_unicode)
 
2302
        self.assertRaises(AssertionError, opt.get_default)
 
2303
 
 
2304
    def test_get_help_topic(self):
 
2305
        opt = config.Option('foo')
 
2306
        self.assertEquals('foo', opt.get_help_topic())
 
2307
 
 
2308
 
 
2309
class TestOptionConverterMixin(object):
 
2310
 
 
2311
    def assertConverted(self, expected, opt, value):
 
2312
        self.assertEquals(expected, opt.convert_from_unicode(None, value))
 
2313
 
 
2314
    def assertWarns(self, opt, value):
 
2315
        warnings = []
 
2316
        def warning(*args):
 
2317
            warnings.append(args[0] % args[1:])
 
2318
        self.overrideAttr(trace, 'warning', warning)
 
2319
        self.assertEquals(None, opt.convert_from_unicode(None, value))
 
2320
        self.assertLength(1, warnings)
 
2321
        self.assertEquals(
 
2322
            'Value "%s" is not valid for "%s"' % (value, opt.name),
 
2323
            warnings[0])
 
2324
 
 
2325
    def assertErrors(self, opt, value):
 
2326
        self.assertRaises(errors.ConfigOptionValueError,
 
2327
                          opt.convert_from_unicode, None, value)
 
2328
 
 
2329
    def assertConvertInvalid(self, opt, invalid_value):
 
2330
        opt.invalid = None
 
2331
        self.assertEquals(None, opt.convert_from_unicode(None, invalid_value))
 
2332
        opt.invalid = 'warning'
 
2333
        self.assertWarns(opt, invalid_value)
 
2334
        opt.invalid = 'error'
 
2335
        self.assertErrors(opt, invalid_value)
 
2336
 
 
2337
 
 
2338
class TestOptionWithBooleanConverter(tests.TestCase, TestOptionConverterMixin):
 
2339
 
 
2340
    def get_option(self):
 
2341
        return config.Option('foo', help='A boolean.',
 
2342
                             from_unicode=config.bool_from_store)
 
2343
 
 
2344
    def test_convert_invalid(self):
 
2345
        opt = self.get_option()
 
2346
        # A string that is not recognized as a boolean
 
2347
        self.assertConvertInvalid(opt, u'invalid-boolean')
 
2348
        # A list of strings is never recognized as a boolean
 
2349
        self.assertConvertInvalid(opt, [u'not', u'a', u'boolean'])
 
2350
 
 
2351
    def test_convert_valid(self):
 
2352
        opt = self.get_option()
 
2353
        self.assertConverted(True, opt, u'True')
 
2354
        self.assertConverted(True, opt, u'1')
 
2355
        self.assertConverted(False, opt, u'False')
 
2356
 
 
2357
 
 
2358
class TestOptionWithIntegerConverter(tests.TestCase, TestOptionConverterMixin):
 
2359
 
 
2360
    def get_option(self):
 
2361
        return config.Option('foo', help='An integer.',
 
2362
                             from_unicode=config.int_from_store)
 
2363
 
 
2364
    def test_convert_invalid(self):
 
2365
        opt = self.get_option()
 
2366
        # A string that is not recognized as an integer
 
2367
        self.assertConvertInvalid(opt, u'forty-two')
 
2368
        # A list of strings is never recognized as an integer
 
2369
        self.assertConvertInvalid(opt, [u'a', u'list'])
 
2370
 
 
2371
    def test_convert_valid(self):
 
2372
        opt = self.get_option()
 
2373
        self.assertConverted(16, opt, u'16')
 
2374
 
 
2375
 
 
2376
class TestOptionWithSIUnitConverter(tests.TestCase, TestOptionConverterMixin):
 
2377
 
 
2378
    def get_option(self):
 
2379
        return config.Option('foo', help='An integer in SI units.',
 
2380
                             from_unicode=config.int_SI_from_store)
 
2381
 
 
2382
    def test_convert_invalid(self):
 
2383
        opt = self.get_option()
 
2384
        self.assertConvertInvalid(opt, u'not-a-unit')
 
2385
        self.assertConvertInvalid(opt, u'Gb') # Forgot the int
 
2386
        self.assertConvertInvalid(opt, u'1b') # Forgot the unit
 
2387
        self.assertConvertInvalid(opt, u'1GG')
 
2388
        self.assertConvertInvalid(opt, u'1Mbb')
 
2389
        self.assertConvertInvalid(opt, u'1MM')
 
2390
 
 
2391
    def test_convert_valid(self):
 
2392
        opt = self.get_option()
 
2393
        self.assertConverted(int(5e3), opt, u'5kb')
 
2394
        self.assertConverted(int(5e6), opt, u'5M')
 
2395
        self.assertConverted(int(5e6), opt, u'5MB')
 
2396
        self.assertConverted(int(5e9), opt, u'5g')
 
2397
        self.assertConverted(int(5e9), opt, u'5gB')
 
2398
        self.assertConverted(100, opt, u'100')
 
2399
 
 
2400
 
 
2401
class TestListOption(tests.TestCase, TestOptionConverterMixin):
 
2402
 
 
2403
    def get_option(self):
 
2404
        return config.ListOption('foo', help='A list.')
 
2405
 
 
2406
    def test_convert_invalid(self):
 
2407
        opt = self.get_option()
 
2408
        # We don't even try to convert a list into a list, we only expect
 
2409
        # strings
 
2410
        self.assertConvertInvalid(opt, [1])
 
2411
        # No string is invalid as all forms can be converted to a list
 
2412
 
 
2413
    def test_convert_valid(self):
 
2414
        opt = self.get_option()
 
2415
        # An empty string is an empty list
 
2416
        self.assertConverted([], opt, '') # Using a bare str() just in case
 
2417
        self.assertConverted([], opt, u'')
 
2418
        # A boolean
 
2419
        self.assertConverted([u'True'], opt, u'True')
 
2420
        # An integer
 
2421
        self.assertConverted([u'42'], opt, u'42')
 
2422
        # A single string
 
2423
        self.assertConverted([u'bar'], opt, u'bar')
 
2424
 
 
2425
 
 
2426
class TestRegistryOption(tests.TestCase, TestOptionConverterMixin):
 
2427
 
 
2428
    def get_option(self, registry):
 
2429
        return config.RegistryOption('foo', registry,
 
2430
                help='A registry option.')
 
2431
 
 
2432
    def test_convert_invalid(self):
 
2433
        registry = _mod_registry.Registry()
 
2434
        opt = self.get_option(registry)
 
2435
        self.assertConvertInvalid(opt, [1])
 
2436
        self.assertConvertInvalid(opt, u"notregistered")
 
2437
 
 
2438
    def test_convert_valid(self):
 
2439
        registry = _mod_registry.Registry()
 
2440
        registry.register("someval", 1234)
 
2441
        opt = self.get_option(registry)
 
2442
        # Using a bare str() just in case
 
2443
        self.assertConverted(1234, opt, "someval")
 
2444
        self.assertConverted(1234, opt, u'someval')
 
2445
        self.assertConverted(None, opt, None)
 
2446
 
 
2447
    def test_help(self):
 
2448
        registry = _mod_registry.Registry()
 
2449
        registry.register("someval", 1234, help="some option")
 
2450
        registry.register("dunno", 1234, help="some other option")
 
2451
        opt = self.get_option(registry)
 
2452
        self.assertEquals(
 
2453
            'A registry option.\n'
 
2454
            '\n'
 
2455
            'The following values are supported:\n'
 
2456
            ' dunno - some other option\n'
 
2457
            ' someval - some option\n',
 
2458
            opt.help)
 
2459
 
 
2460
    def test_get_help_text(self):
 
2461
        registry = _mod_registry.Registry()
 
2462
        registry.register("someval", 1234, help="some option")
 
2463
        registry.register("dunno", 1234, help="some other option")
 
2464
        opt = self.get_option(registry)
 
2465
        self.assertEquals(
 
2466
            'A registry option.\n'
 
2467
            '\n'
 
2468
            'The following values are supported:\n'
 
2469
            ' dunno - some other option\n'
 
2470
            ' someval - some option\n',
 
2471
            opt.get_help_text())
 
2472
 
2216
2473
 
2217
2474
class TestOptionRegistry(tests.TestCase):
2218
2475
 
2232
2489
        self.registry.register(opt)
2233
2490
        self.assertEquals('A simple option', self.registry.get_help('foo'))
2234
2491
 
 
2492
    def test_dont_register_illegal_name(self):
 
2493
        self.assertRaises(errors.IllegalOptionName,
 
2494
                          self.registry.register, config.Option(' foo'))
 
2495
        self.assertRaises(errors.IllegalOptionName,
 
2496
                          self.registry.register, config.Option('bar,'))
 
2497
 
2235
2498
    lazy_option = config.Option('lazy_foo', help='Lazy help')
2236
2499
 
2237
2500
    def test_register_lazy(self):
2244
2507
                                    'TestOptionRegistry.lazy_option')
2245
2508
        self.assertEquals('Lazy help', self.registry.get_help('lazy_foo'))
2246
2509
 
 
2510
    def test_dont_lazy_register_illegal_name(self):
 
2511
        # This is where the root cause of http://pad.lv/1235099 is better
 
2512
        # understood: 'register_lazy' doc string mentions that key should match
 
2513
        # the option name which indirectly requires that the option name is a
 
2514
        # valid python identifier. We violate that rule here (using a key that
 
2515
        # doesn't match the option name) to test the option name checking.
 
2516
        self.assertRaises(errors.IllegalOptionName,
 
2517
                          self.registry.register_lazy, ' foo', self.__module__,
 
2518
                          'TestOptionRegistry.lazy_option')
 
2519
        self.assertRaises(errors.IllegalOptionName,
 
2520
                          self.registry.register_lazy, '1,2', self.__module__,
 
2521
                          'TestOptionRegistry.lazy_option')
 
2522
 
2247
2523
 
2248
2524
class TestRegisteredOptions(tests.TestCase):
2249
2525
    """All registered options should verify some constraints."""
2262
2538
 
2263
2539
    def test_help_is_set(self):
2264
2540
        option_help = self.registry.get_help(self.option_name)
2265
 
        self.assertNotEquals(None, option_help)
2266
2541
        # Come on, think about the user, he really wants to know what the
2267
2542
        # option is about
2268
2543
        self.assertIsNot(None, option_help)
2293
2568
 
2294
2569
class TestMutableSection(tests.TestCase):
2295
2570
 
2296
 
    # FIXME: Parametrize so that all sections (including os.environ and the
2297
 
    # ones produced by Stores) run these tests -- vila 2011-04-01
 
2571
    scenarios = [('mutable',
 
2572
                  {'get_section':
 
2573
                       lambda opts: config.MutableSection('myID', opts)},),
 
2574
        ]
2298
2575
 
2299
2576
    def test_set(self):
2300
2577
        a_dict = dict(foo='bar')
2301
 
        section = config.MutableSection('myID', a_dict)
 
2578
        section = self.get_section(a_dict)
2302
2579
        section.set('foo', 'new_value')
2303
2580
        self.assertEquals('new_value', section.get('foo'))
2304
2581
        # The change appears in the shared section
2309
2586
 
2310
2587
    def test_set_preserve_original_once(self):
2311
2588
        a_dict = dict(foo='bar')
2312
 
        section = config.MutableSection('myID', a_dict)
 
2589
        section = self.get_section(a_dict)
2313
2590
        section.set('foo', 'first_value')
2314
2591
        section.set('foo', 'second_value')
2315
2592
        # We keep track of the original value
2318
2595
 
2319
2596
    def test_remove(self):
2320
2597
        a_dict = dict(foo='bar')
2321
 
        section = config.MutableSection('myID', a_dict)
 
2598
        section = self.get_section(a_dict)
2322
2599
        section.remove('foo')
2323
2600
        # We get None for unknown options via the default value
2324
2601
        self.assertEquals(None, section.get('foo'))
2331
2608
 
2332
2609
    def test_remove_new_option(self):
2333
2610
        a_dict = dict()
2334
 
        section = config.MutableSection('myID', a_dict)
 
2611
        section = self.get_section(a_dict)
2335
2612
        section.set('foo', 'bar')
2336
2613
        section.remove('foo')
2337
2614
        self.assertFalse('foo' in section.options)
2341
2618
        self.assertEquals(config._NewlyCreatedOption, section.orig['foo'])
2342
2619
 
2343
2620
 
 
2621
class TestCommandLineStore(tests.TestCase):
 
2622
 
 
2623
    def setUp(self):
 
2624
        super(TestCommandLineStore, self).setUp()
 
2625
        self.store = config.CommandLineStore()
 
2626
        self.overrideAttr(config, 'option_registry', config.OptionRegistry())
 
2627
 
 
2628
    def get_section(self):
 
2629
        """Get the unique section for the command line overrides."""
 
2630
        sections = list(self.store.get_sections())
 
2631
        self.assertLength(1, sections)
 
2632
        store, section = sections[0]
 
2633
        self.assertEquals(self.store, store)
 
2634
        return section
 
2635
 
 
2636
    def test_no_override(self):
 
2637
        self.store._from_cmdline([])
 
2638
        section = self.get_section()
 
2639
        self.assertLength(0, list(section.iter_option_names()))
 
2640
 
 
2641
    def test_simple_override(self):
 
2642
        self.store._from_cmdline(['a=b'])
 
2643
        section = self.get_section()
 
2644
        self.assertEqual('b', section.get('a'))
 
2645
 
 
2646
    def test_list_override(self):
 
2647
        opt = config.ListOption('l')
 
2648
        config.option_registry.register(opt)
 
2649
        self.store._from_cmdline(['l=1,2,3'])
 
2650
        val = self.get_section().get('l')
 
2651
        self.assertEqual('1,2,3', val)
 
2652
        # Reminder: lists should be registered as such explicitely, otherwise
 
2653
        # the conversion needs to be done afterwards.
 
2654
        self.assertEqual(['1', '2', '3'],
 
2655
                         opt.convert_from_unicode(self.store, val))
 
2656
 
 
2657
    def test_multiple_overrides(self):
 
2658
        self.store._from_cmdline(['a=b', 'x=y'])
 
2659
        section = self.get_section()
 
2660
        self.assertEquals('b', section.get('a'))
 
2661
        self.assertEquals('y', section.get('x'))
 
2662
 
 
2663
    def test_wrong_syntax(self):
 
2664
        self.assertRaises(errors.BzrCommandError,
 
2665
                          self.store._from_cmdline, ['a=b', 'c'])
 
2666
 
 
2667
class TestStoreMinimalAPI(tests.TestCaseWithTransport):
 
2668
 
 
2669
    scenarios = [(key, {'get_store': builder}) for key, builder
 
2670
                 in config.test_store_builder_registry.iteritems()] + [
 
2671
        ('cmdline', {'get_store': lambda test: config.CommandLineStore()})]
 
2672
 
 
2673
    def test_id(self):
 
2674
        store = self.get_store(self)
 
2675
        if type(store) == config.TransportIniFileStore:
 
2676
            raise tests.TestNotApplicable(
 
2677
                "%s is not a concrete Store implementation"
 
2678
                " so it doesn't need an id" % (store.__class__.__name__,))
 
2679
        self.assertIsNot(None, store.id)
 
2680
 
 
2681
 
2344
2682
class TestStore(tests.TestCaseWithTransport):
2345
2683
 
2346
 
    def assertSectionContent(self, expected, section):
 
2684
    def assertSectionContent(self, expected, (store, section)):
2347
2685
        """Assert that some options have the proper values in a section."""
2348
2686
        expected_name, expected_options = expected
2349
2687
        self.assertEquals(expected_name, section.id)
2357
2695
    scenarios = [(key, {'get_store': builder}) for key, builder
2358
2696
                 in config.test_store_builder_registry.iteritems()]
2359
2697
 
2360
 
    def setUp(self):
2361
 
        super(TestReadonlyStore, self).setUp()
2362
 
 
2363
2698
    def test_building_delays_load(self):
2364
2699
        store = self.get_store(self)
2365
2700
        self.assertEquals(False, store.is_loaded())
2391
2726
        self.assertRaises(AssertionError, store._load_from_string, 'bar=baz')
2392
2727
 
2393
2728
 
 
2729
class TestStoreQuoting(TestStore):
 
2730
 
 
2731
    scenarios = [(key, {'get_store': builder}) for key, builder
 
2732
                 in config.test_store_builder_registry.iteritems()]
 
2733
 
 
2734
    def setUp(self):
 
2735
        super(TestStoreQuoting, self).setUp()
 
2736
        self.store = self.get_store(self)
 
2737
        # We need a loaded store but any content will do
 
2738
        self.store._load_from_string('')
 
2739
 
 
2740
    def assertIdempotent(self, s):
 
2741
        """Assert that quoting an unquoted string is a no-op and vice-versa.
 
2742
 
 
2743
        What matters here is that option values, as they appear in a store, can
 
2744
        be safely round-tripped out of the store and back.
 
2745
 
 
2746
        :param s: A string, quoted if required.
 
2747
        """
 
2748
        self.assertEquals(s, self.store.quote(self.store.unquote(s)))
 
2749
        self.assertEquals(s, self.store.unquote(self.store.quote(s)))
 
2750
 
 
2751
    def test_empty_string(self):
 
2752
        if isinstance(self.store, config.IniFileStore):
 
2753
            # configobj._quote doesn't handle empty values
 
2754
            self.assertRaises(AssertionError,
 
2755
                              self.assertIdempotent, '')
 
2756
        else:
 
2757
            self.assertIdempotent('')
 
2758
        # But quoted empty strings are ok
 
2759
        self.assertIdempotent('""')
 
2760
 
 
2761
    def test_embedded_spaces(self):
 
2762
        self.assertIdempotent('" a b c "')
 
2763
 
 
2764
    def test_embedded_commas(self):
 
2765
        self.assertIdempotent('" a , b c "')
 
2766
 
 
2767
    def test_simple_comma(self):
 
2768
        if isinstance(self.store, config.IniFileStore):
 
2769
            # configobj requires that lists are special-cased
 
2770
           self.assertRaises(AssertionError,
 
2771
                             self.assertIdempotent, ',')
 
2772
        else:
 
2773
            self.assertIdempotent(',')
 
2774
        # When a single comma is required, quoting is also required
 
2775
        self.assertIdempotent('","')
 
2776
 
 
2777
    def test_list(self):
 
2778
        if isinstance(self.store, config.IniFileStore):
 
2779
            # configobj requires that lists are special-cased
 
2780
            self.assertRaises(AssertionError,
 
2781
                              self.assertIdempotent, 'a,b')
 
2782
        else:
 
2783
            self.assertIdempotent('a,b')
 
2784
 
 
2785
 
 
2786
class TestDictFromStore(tests.TestCase):
 
2787
 
 
2788
    def test_unquote_not_string(self):
 
2789
        conf = config.MemoryStack('x=2\n[a_section]\na=1\n')
 
2790
        value = conf.get('a_section')
 
2791
        # Urgh, despite 'conf' asking for the no-name section, we get the
 
2792
        # content of another section as a dict o_O
 
2793
        self.assertEquals({'a': '1'}, value)
 
2794
        unquoted = conf.store.unquote(value)
 
2795
        # Which cannot be unquoted but shouldn't crash either (the use cases
 
2796
        # are getting the value or displaying it. In the later case, '%s' will
 
2797
        # do).
 
2798
        self.assertEquals({'a': '1'}, unquoted)
 
2799
        self.assertEquals("{u'a': u'1'}", '%s' % (unquoted,))
 
2800
 
 
2801
 
2394
2802
class TestIniFileStoreContent(tests.TestCaseWithTransport):
2395
 
    """Simulate loading a config store without content of various encodings.
 
2803
    """Simulate loading a config store with content of various encodings.
2396
2804
 
2397
2805
    All files produced by bzr are in utf8 content.
2398
2806
 
2411
2819
        utf8_content = unicode_content.encode('utf8')
2412
2820
        # Store the raw content in the config file
2413
2821
        t.put_bytes('foo.conf', utf8_content)
2414
 
        store = config.IniFileStore(t, 'foo.conf')
 
2822
        store = config.TransportIniFileStore(t, 'foo.conf')
2415
2823
        store.load()
2416
2824
        stack = config.Stack([store.get_sections], store)
2417
2825
        self.assertEquals(unicode_user, stack.get('user'))
2420
2828
        """Ensure we display a proper error on non-ascii, non utf-8 content."""
2421
2829
        t = self.get_transport()
2422
2830
        t.put_bytes('foo.conf', 'user=foo\n#%s\n' % (self.invalid_utf8_char,))
2423
 
        store = config.IniFileStore(t, 'foo.conf')
 
2831
        store = config.TransportIniFileStore(t, 'foo.conf')
2424
2832
        self.assertRaises(errors.ConfigContentError, store.load)
2425
2833
 
2426
2834
    def test_load_erroneous_content(self):
2427
2835
        """Ensure we display a proper error on content that can't be parsed."""
2428
2836
        t = self.get_transport()
2429
2837
        t.put_bytes('foo.conf', '[open_section\n')
2430
 
        store = config.IniFileStore(t, 'foo.conf')
 
2838
        store = config.TransportIniFileStore(t, 'foo.conf')
2431
2839
        self.assertRaises(errors.ParseConfigError, store.load)
2432
2840
 
 
2841
    def test_load_permission_denied(self):
 
2842
        """Ensure we get warned when trying to load an inaccessible file."""
 
2843
        warnings = []
 
2844
        def warning(*args):
 
2845
            warnings.append(args[0] % args[1:])
 
2846
        self.overrideAttr(trace, 'warning', warning)
 
2847
 
 
2848
        t = self.get_transport()
 
2849
 
 
2850
        def get_bytes(relpath):
 
2851
            raise errors.PermissionDenied(relpath, "")
 
2852
        t.get_bytes = get_bytes
 
2853
        store = config.TransportIniFileStore(t, 'foo.conf')
 
2854
        self.assertRaises(errors.PermissionDenied, store.load)
 
2855
        self.assertEquals(
 
2856
            warnings,
 
2857
            [u'Permission denied while trying to load configuration store %s.'
 
2858
             % store.external_url()])
 
2859
 
2433
2860
 
2434
2861
class TestIniConfigContent(tests.TestCaseWithTransport):
2435
 
    """Simulate loading a IniBasedConfig without content of various encodings.
 
2862
    """Simulate loading a IniBasedConfig with content of various encodings.
2436
2863
 
2437
2864
    All files produced by bzr are in utf8 content.
2438
2865
 
2493
2920
        store.save()
2494
2921
        self.assertEquals(False, self.has_store(store))
2495
2922
 
 
2923
    def test_mutable_section_shared(self):
 
2924
        store = self.get_store(self)
 
2925
        store._load_from_string('foo=bar\n')
 
2926
        # FIXME: There should be a better way than relying on the test
 
2927
        # parametrization to identify branch.conf -- vila 2011-0526
 
2928
        if self.store_id in ('branch', 'remote_branch'):
 
2929
            # branch stores requires write locked branches
 
2930
            self.addCleanup(store.branch.lock_write().unlock)
 
2931
        section1 = store.get_mutable_section(None)
 
2932
        section2 = store.get_mutable_section(None)
 
2933
        # If we get different sections, different callers won't share the
 
2934
        # modification
 
2935
        self.assertIs(section1, section2)
 
2936
 
2496
2937
    def test_save_emptied_succeeds(self):
2497
2938
        store = self.get_store(self)
2498
2939
        store._load_from_string('foo=bar\n')
 
2940
        # FIXME: There should be a better way than relying on the test
 
2941
        # parametrization to identify branch.conf -- vila 2011-0526
 
2942
        if self.store_id in ('branch', 'remote_branch'):
 
2943
            # branch stores requires write locked branches
 
2944
            self.addCleanup(store.branch.lock_write().unlock)
2499
2945
        section = store.get_mutable_section(None)
2500
2946
        section.remove('foo')
2501
2947
        store.save()
2522
2968
 
2523
2969
    def test_set_option_in_empty_store(self):
2524
2970
        store = self.get_store(self)
 
2971
        # FIXME: There should be a better way than relying on the test
 
2972
        # parametrization to identify branch.conf -- vila 2011-0526
 
2973
        if self.store_id in ('branch', 'remote_branch'):
 
2974
            # branch stores requires write locked branches
 
2975
            self.addCleanup(store.branch.lock_write().unlock)
2525
2976
        section = store.get_mutable_section(None)
2526
2977
        section.set('foo', 'bar')
2527
2978
        store.save()
2533
2984
    def test_set_option_in_default_section(self):
2534
2985
        store = self.get_store(self)
2535
2986
        store._load_from_string('')
 
2987
        # FIXME: There should be a better way than relying on the test
 
2988
        # parametrization to identify branch.conf -- vila 2011-0526
 
2989
        if self.store_id in ('branch', 'remote_branch'):
 
2990
            # branch stores requires write locked branches
 
2991
            self.addCleanup(store.branch.lock_write().unlock)
2536
2992
        section = store.get_mutable_section(None)
2537
2993
        section.set('foo', 'bar')
2538
2994
        store.save()
2544
3000
    def test_set_option_in_named_section(self):
2545
3001
        store = self.get_store(self)
2546
3002
        store._load_from_string('')
 
3003
        # FIXME: There should be a better way than relying on the test
 
3004
        # parametrization to identify branch.conf -- vila 2011-0526
 
3005
        if self.store_id in ('branch', 'remote_branch'):
 
3006
            # branch stores requires write locked branches
 
3007
            self.addCleanup(store.branch.lock_write().unlock)
2547
3008
        section = store.get_mutable_section('baz')
2548
3009
        section.set('foo', 'bar')
2549
3010
        store.save()
2553
3014
        self.assertSectionContent(('baz', {'foo': 'bar'}), sections[0])
2554
3015
 
2555
3016
    def test_load_hook(self):
2556
 
        # We first needs to ensure that the store exists
 
3017
        # First, we need to ensure that the store exists
2557
3018
        store = self.get_store(self)
 
3019
        # FIXME: There should be a better way than relying on the test
 
3020
        # parametrization to identify branch.conf -- vila 2011-0526
 
3021
        if self.store_id in ('branch', 'remote_branch'):
 
3022
            # branch stores requires write locked branches
 
3023
            self.addCleanup(store.branch.lock_write().unlock)
2558
3024
        section = store.get_mutable_section('baz')
2559
3025
        section.set('foo', 'bar')
2560
3026
        store.save()
2576
3042
        config.ConfigHooks.install_named_hook('save', hook, None)
2577
3043
        self.assertLength(0, calls)
2578
3044
        store = self.get_store(self)
 
3045
        # FIXME: There should be a better way than relying on the test
 
3046
        # parametrization to identify branch.conf -- vila 2011-0526
 
3047
        if self.store_id in ('branch', 'remote_branch'):
 
3048
            # branch stores requires write locked branches
 
3049
            self.addCleanup(store.branch.lock_write().unlock)
2579
3050
        section = store.get_mutable_section('baz')
2580
3051
        section.set('foo', 'bar')
2581
3052
        store.save()
2582
3053
        self.assertLength(1, calls)
2583
3054
        self.assertEquals((store,), calls[0])
2584
3055
 
2585
 
 
2586
 
class TestIniFileStore(TestStore):
 
3056
    def test_set_mark_dirty(self):
 
3057
        stack = config.MemoryStack('')
 
3058
        self.assertLength(0, stack.store.dirty_sections)
 
3059
        stack.set('foo', 'baz')
 
3060
        self.assertLength(1, stack.store.dirty_sections)
 
3061
        self.assertTrue(stack.store._need_saving())
 
3062
 
 
3063
    def test_remove_mark_dirty(self):
 
3064
        stack = config.MemoryStack('foo=bar')
 
3065
        self.assertLength(0, stack.store.dirty_sections)
 
3066
        stack.remove('foo')
 
3067
        self.assertLength(1, stack.store.dirty_sections)
 
3068
        self.assertTrue(stack.store._need_saving())
 
3069
 
 
3070
 
 
3071
class TestStoreSaveChanges(tests.TestCaseWithTransport):
 
3072
    """Tests that config changes are kept in memory and saved on-demand."""
 
3073
 
 
3074
    def setUp(self):
 
3075
        super(TestStoreSaveChanges, self).setUp()
 
3076
        self.transport = self.get_transport()
 
3077
        # Most of the tests involve two stores pointing to the same persistent
 
3078
        # storage to observe the effects of concurrent changes
 
3079
        self.st1 = config.TransportIniFileStore(self.transport, 'foo.conf')
 
3080
        self.st2 = config.TransportIniFileStore(self.transport, 'foo.conf')
 
3081
        self.warnings = []
 
3082
        def warning(*args):
 
3083
            self.warnings.append(args[0] % args[1:])
 
3084
        self.overrideAttr(trace, 'warning', warning)
 
3085
 
 
3086
    def has_store(self, store):
 
3087
        store_basename = urlutils.relative_url(self.transport.external_url(),
 
3088
                                               store.external_url())
 
3089
        return self.transport.has(store_basename)
 
3090
 
 
3091
    def get_stack(self, store):
 
3092
        # Any stack will do as long as it uses the right store, just a single
 
3093
        # no-name section is enough
 
3094
        return config.Stack([store.get_sections], store)
 
3095
 
 
3096
    def test_no_changes_no_save(self):
 
3097
        s = self.get_stack(self.st1)
 
3098
        s.store.save_changes()
 
3099
        self.assertEquals(False, self.has_store(self.st1))
 
3100
 
 
3101
    def test_unrelated_concurrent_update(self):
 
3102
        s1 = self.get_stack(self.st1)
 
3103
        s2 = self.get_stack(self.st2)
 
3104
        s1.set('foo', 'bar')
 
3105
        s2.set('baz', 'quux')
 
3106
        s1.store.save()
 
3107
        # Changes don't propagate magically
 
3108
        self.assertEquals(None, s1.get('baz'))
 
3109
        s2.store.save_changes()
 
3110
        self.assertEquals('quux', s2.get('baz'))
 
3111
        # Changes are acquired when saving
 
3112
        self.assertEquals('bar', s2.get('foo'))
 
3113
        # Since there is no overlap, no warnings are emitted
 
3114
        self.assertLength(0, self.warnings)
 
3115
 
 
3116
    def test_concurrent_update_modified(self):
 
3117
        s1 = self.get_stack(self.st1)
 
3118
        s2 = self.get_stack(self.st2)
 
3119
        s1.set('foo', 'bar')
 
3120
        s2.set('foo', 'baz')
 
3121
        s1.store.save()
 
3122
        # Last speaker wins
 
3123
        s2.store.save_changes()
 
3124
        self.assertEquals('baz', s2.get('foo'))
 
3125
        # But the user get a warning
 
3126
        self.assertLength(1, self.warnings)
 
3127
        warning = self.warnings[0]
 
3128
        self.assertStartsWith(warning, 'Option foo in section None')
 
3129
        self.assertEndsWith(warning, 'was changed from <CREATED> to bar.'
 
3130
                            ' The baz value will be saved.')
 
3131
 
 
3132
    def test_concurrent_deletion(self):
 
3133
        self.st1._load_from_string('foo=bar')
 
3134
        self.st1.save()
 
3135
        s1 = self.get_stack(self.st1)
 
3136
        s2 = self.get_stack(self.st2)
 
3137
        s1.remove('foo')
 
3138
        s2.remove('foo')
 
3139
        s1.store.save_changes()
 
3140
        # No warning yet
 
3141
        self.assertLength(0, self.warnings)
 
3142
        s2.store.save_changes()
 
3143
        # Now we get one
 
3144
        self.assertLength(1, self.warnings)
 
3145
        warning = self.warnings[0]
 
3146
        self.assertStartsWith(warning, 'Option foo in section None')
 
3147
        self.assertEndsWith(warning, 'was changed from bar to <CREATED>.'
 
3148
                            ' The <DELETED> value will be saved.')
 
3149
 
 
3150
 
 
3151
class TestQuotingIniFileStore(tests.TestCaseWithTransport):
 
3152
 
 
3153
    def get_store(self):
 
3154
        return config.TransportIniFileStore(self.get_transport(), 'foo.conf')
 
3155
 
 
3156
    def test_get_quoted_string(self):
 
3157
        store = self.get_store()
 
3158
        store._load_from_string('foo= " abc "')
 
3159
        stack = config.Stack([store.get_sections])
 
3160
        self.assertEquals(' abc ', stack.get('foo'))
 
3161
 
 
3162
    def test_set_quoted_string(self):
 
3163
        store = self.get_store()
 
3164
        stack = config.Stack([store.get_sections], store)
 
3165
        stack.set('foo', ' a b c ')
 
3166
        store.save()
 
3167
        self.assertFileEqual('foo = " a b c "' + os.linesep, 'foo.conf')
 
3168
 
 
3169
 
 
3170
class TestTransportIniFileStore(TestStore):
2587
3171
 
2588
3172
    def test_loading_unknown_file_fails(self):
2589
 
        store = config.IniFileStore(self.get_transport(), 'I-do-not-exist')
 
3173
        store = config.TransportIniFileStore(self.get_transport(),
 
3174
            'I-do-not-exist')
2590
3175
        self.assertRaises(errors.NoSuchFile, store.load)
2591
3176
 
2592
3177
    def test_invalid_content(self):
2593
 
        store = config.IniFileStore(self.get_transport(), 'foo.conf', )
 
3178
        store = config.TransportIniFileStore(self.get_transport(), 'foo.conf')
2594
3179
        self.assertEquals(False, store.is_loaded())
2595
3180
        exc = self.assertRaises(
2596
3181
            errors.ParseConfigError, store._load_from_string,
2604
3189
        # option names share the same name space...)
2605
3190
        # FIXME: This should be fixed by forbidding dicts as values ?
2606
3191
        # -- vila 2011-04-05
2607
 
        store = config.IniFileStore(self.get_transport(), 'foo.conf', )
 
3192
        store = config.TransportIniFileStore(self.get_transport(), 'foo.conf')
2608
3193
        store._load_from_string('''
2609
3194
foo=bar
2610
3195
l=1,2
2620
3205
        sections = list(store.get_sections())
2621
3206
        self.assertLength(4, sections)
2622
3207
        # The default section has no name.
2623
 
        # List values are provided as lists
2624
 
        self.assertSectionContent((None, {'foo': 'bar', 'l': ['1', '2']}),
 
3208
        # List values are provided as strings and need to be explicitly
 
3209
        # converted by specifying from_unicode=list_from_store at option
 
3210
        # registration
 
3211
        self.assertSectionContent((None, {'foo': 'bar', 'l': u'1,2'}),
2625
3212
                                  sections[0])
2626
3213
        self.assertSectionContent(
2627
3214
            ('DEFAULT', {'foo_in_DEFAULT': 'foo_DEFAULT'}), sections[1])
2657
3244
 
2658
3245
    def setUp(self):
2659
3246
        super(TestConcurrentStoreUpdates, self).setUp()
2660
 
        self._content = 'one=1\ntwo=2\n'
2661
3247
        self.stack = self.get_stack(self)
2662
3248
        if not isinstance(self.stack, config._CompatibleStack):
2663
3249
            raise tests.TestNotApplicable(
2664
3250
                '%s is not meant to be compatible with the old config design'
2665
3251
                % (self.stack,))
2666
 
        self.stack.store._load_from_string(self._content)
 
3252
        self.stack.set('one', '1')
 
3253
        self.stack.set('two', '2')
2667
3254
        # Flush the store
2668
3255
        self.stack.store.save()
2669
3256
 
2773
3360
    # FIXME: It may be worth looking into removing the lock dir when it's not
2774
3361
    # needed anymore and look at possible fallouts for concurrent lockers. This
2775
3362
    # will matter if/when we use config files outside of bazaar directories
2776
 
    # (.bazaar or .bzr) -- vila 20110-04-11
 
3363
    # (.bazaar or .bzr) -- vila 20110-04-111
2777
3364
 
2778
3365
 
2779
3366
class TestSectionMatcher(TestStore):
2780
3367
 
2781
 
    scenarios = [('location', {'matcher': config.LocationMatcher})]
 
3368
    scenarios = [('location', {'matcher': config.LocationMatcher}),
 
3369
                 ('id', {'matcher': config.NameMatcher}),]
2782
3370
 
2783
 
    def get_store(self, file_name):
2784
 
        return config.IniFileStore(self.get_readonly_transport(), file_name)
 
3371
    def setUp(self):
 
3372
        super(TestSectionMatcher, self).setUp()
 
3373
        # Any simple store is good enough
 
3374
        self.get_store = config.test_store_builder_registry.get('configobj')
2785
3375
 
2786
3376
    def test_no_matches_for_empty_stores(self):
2787
 
        store = self.get_store('foo.conf')
 
3377
        store = self.get_store(self)
2788
3378
        store._load_from_string('')
2789
3379
        matcher = self.matcher(store, '/bar')
2790
3380
        self.assertEquals([], list(matcher.get_sections()))
2791
3381
 
2792
3382
    def test_build_doesnt_load_store(self):
2793
 
        store = self.get_store('foo.conf')
2794
 
        matcher = self.matcher(store, '/bar')
 
3383
        store = self.get_store(self)
 
3384
        self.matcher(store, '/bar')
2795
3385
        self.assertFalse(store.is_loaded())
2796
3386
 
2797
3387
 
2799
3389
 
2800
3390
    def get_section(self, options, extra_path):
2801
3391
        section = config.Section('foo', options)
2802
 
        # We don't care about the length so we use '0'
2803
 
        return config.LocationSection(section, 0, extra_path)
 
3392
        return config.LocationSection(section, extra_path)
2804
3393
 
2805
3394
    def test_simple_option(self):
2806
3395
        section = self.get_section({'foo': 'bar'}, '')
2820
3409
 
2821
3410
class TestLocationMatcher(TestStore):
2822
3411
 
2823
 
    def get_store(self, file_name):
2824
 
        return config.IniFileStore(self.get_readonly_transport(), file_name)
 
3412
    def setUp(self):
 
3413
        super(TestLocationMatcher, self).setUp()
 
3414
        # Any simple store is good enough
 
3415
        self.get_store = config.test_store_builder_registry.get('configobj')
 
3416
 
 
3417
    def test_unrelated_section_excluded(self):
 
3418
        store = self.get_store(self)
 
3419
        store._load_from_string('''
 
3420
[/foo]
 
3421
section=/foo
 
3422
[/foo/baz]
 
3423
section=/foo/baz
 
3424
[/foo/bar]
 
3425
section=/foo/bar
 
3426
[/foo/bar/baz]
 
3427
section=/foo/bar/baz
 
3428
[/quux/quux]
 
3429
section=/quux/quux
 
3430
''')
 
3431
        self.assertEquals(['/foo', '/foo/baz', '/foo/bar', '/foo/bar/baz',
 
3432
                           '/quux/quux'],
 
3433
                          [section.id for _, section in store.get_sections()])
 
3434
        matcher = config.LocationMatcher(store, '/foo/bar/quux')
 
3435
        sections = [section for _, section in matcher.get_sections()]
 
3436
        self.assertEquals(['/foo/bar', '/foo'],
 
3437
                          [section.id for section in sections])
 
3438
        self.assertEquals(['quux', 'bar/quux'],
 
3439
                          [section.extra_path for section in sections])
2825
3440
 
2826
3441
    def test_more_specific_sections_first(self):
2827
 
        store = self.get_store('foo.conf')
 
3442
        store = self.get_store(self)
2828
3443
        store._load_from_string('''
2829
3444
[/foo]
2830
3445
section=/foo
2832
3447
section=/foo/bar
2833
3448
''')
2834
3449
        self.assertEquals(['/foo', '/foo/bar'],
2835
 
                          [section.id for section in store.get_sections()])
 
3450
                          [section.id for _, section in store.get_sections()])
2836
3451
        matcher = config.LocationMatcher(store, '/foo/bar/baz')
2837
 
        sections = list(matcher.get_sections())
2838
 
        self.assertEquals([3, 2],
2839
 
                          [section.length for section in sections])
 
3452
        sections = [section for _, section in matcher.get_sections()]
2840
3453
        self.assertEquals(['/foo/bar', '/foo'],
2841
3454
                          [section.id for section in sections])
2842
3455
        self.assertEquals(['baz', 'bar/baz'],
2845
3458
    def test_appendpath_in_no_name_section(self):
2846
3459
        # It's a bit weird to allow appendpath in a no-name section, but
2847
3460
        # someone may found a use for it
2848
 
        store = self.get_store('foo.conf')
 
3461
        store = self.get_store(self)
2849
3462
        store._load_from_string('''
2850
3463
foo=bar
2851
3464
foo:policy = appendpath
2853
3466
        matcher = config.LocationMatcher(store, 'dir/subdir')
2854
3467
        sections = list(matcher.get_sections())
2855
3468
        self.assertLength(1, sections)
2856
 
        self.assertEquals('bar/dir/subdir', sections[0].get('foo'))
 
3469
        self.assertEquals('bar/dir/subdir', sections[0][1].get('foo'))
2857
3470
 
2858
3471
    def test_file_urls_are_normalized(self):
2859
 
        store = self.get_store('foo.conf')
 
3472
        store = self.get_store(self)
2860
3473
        if sys.platform == 'win32':
2861
3474
            expected_url = 'file:///C:/dir/subdir'
2862
3475
            expected_location = 'C:/dir/subdir'
2866
3479
        matcher = config.LocationMatcher(store, expected_url)
2867
3480
        self.assertEquals(expected_location, matcher.location)
2868
3481
 
2869
 
 
2870
 
class TestStackGet(tests.TestCase):
2871
 
 
2872
 
    # FIXME: This should be parametrized for all known Stack or dedicated
2873
 
    # paramerized tests created to avoid bloating -- vila 2011-03-31
2874
 
 
2875
 
    def overrideOptionRegistry(self):
 
3482
    def test_branch_name_colo(self):
 
3483
        store = self.get_store(self)
 
3484
        store._load_from_string(dedent("""\
 
3485
            [/]
 
3486
            push_location=my{branchname}
 
3487
        """))
 
3488
        matcher = config.LocationMatcher(store, 'file:///,branch=example%3c')
 
3489
        self.assertEqual('example<', matcher.branch_name)
 
3490
        ((_, section),) = matcher.get_sections()
 
3491
        self.assertEqual('example<', section.locals['branchname'])
 
3492
 
 
3493
    def test_branch_name_basename(self):
 
3494
        store = self.get_store(self)
 
3495
        store._load_from_string(dedent("""\
 
3496
            [/]
 
3497
            push_location=my{branchname}
 
3498
        """))
 
3499
        matcher = config.LocationMatcher(store, 'file:///parent/example%3c')
 
3500
        self.assertEqual('example<', matcher.branch_name)
 
3501
        ((_, section),) = matcher.get_sections()
 
3502
        self.assertEqual('example<', section.locals['branchname'])
 
3503
 
 
3504
 
 
3505
class TestStartingPathMatcher(TestStore):
 
3506
 
 
3507
    def setUp(self):
 
3508
        super(TestStartingPathMatcher, self).setUp()
 
3509
        # Any simple store is good enough
 
3510
        self.store = config.IniFileStore()
 
3511
 
 
3512
    def assertSectionIDs(self, expected, location, content):
 
3513
        self.store._load_from_string(content)
 
3514
        matcher = config.StartingPathMatcher(self.store, location)
 
3515
        sections = list(matcher.get_sections())
 
3516
        self.assertLength(len(expected), sections)
 
3517
        self.assertEqual(expected, [section.id for _, section in sections])
 
3518
        return sections
 
3519
 
 
3520
    def test_empty(self):
 
3521
        self.assertSectionIDs([], self.get_url(), '')
 
3522
 
 
3523
    def test_url_vs_local_paths(self):
 
3524
        # The matcher location is an url and the section names are local paths
 
3525
        self.assertSectionIDs(['/foo/bar', '/foo'],
 
3526
                              'file:///foo/bar/baz', '''\
 
3527
[/foo]
 
3528
[/foo/bar]
 
3529
''')
 
3530
 
 
3531
    def test_local_path_vs_url(self):
 
3532
        # The matcher location is a local path and the section names are urls
 
3533
        self.assertSectionIDs(['file:///foo/bar', 'file:///foo'],
 
3534
                              '/foo/bar/baz', '''\
 
3535
[file:///foo]
 
3536
[file:///foo/bar]
 
3537
''')
 
3538
 
 
3539
 
 
3540
    def test_no_name_section_included_when_present(self):
 
3541
        # Note that other tests will cover the case where the no-name section
 
3542
        # is empty and as such, not included.
 
3543
        sections = self.assertSectionIDs(['/foo/bar', '/foo', None],
 
3544
                                         '/foo/bar/baz', '''\
 
3545
option = defined so the no-name section exists
 
3546
[/foo]
 
3547
[/foo/bar]
 
3548
''')
 
3549
        self.assertEquals(['baz', 'bar/baz', '/foo/bar/baz'],
 
3550
                          [s.locals['relpath'] for _, s in sections])
 
3551
 
 
3552
    def test_order_reversed(self):
 
3553
        self.assertSectionIDs(['/foo/bar', '/foo'], '/foo/bar/baz', '''\
 
3554
[/foo]
 
3555
[/foo/bar]
 
3556
''')
 
3557
 
 
3558
    def test_unrelated_section_excluded(self):
 
3559
        self.assertSectionIDs(['/foo/bar', '/foo'], '/foo/bar/baz', '''\
 
3560
[/foo]
 
3561
[/foo/qux]
 
3562
[/foo/bar]
 
3563
''')
 
3564
 
 
3565
    def test_glob_included(self):
 
3566
        sections = self.assertSectionIDs(['/foo/*/baz', '/foo/b*', '/foo'],
 
3567
                                         '/foo/bar/baz', '''\
 
3568
[/foo]
 
3569
[/foo/qux]
 
3570
[/foo/b*]
 
3571
[/foo/*/baz]
 
3572
''')
 
3573
        # Note that 'baz' as a relpath for /foo/b* is not fully correct, but
 
3574
        # nothing really is... as far using {relpath} to append it to something
 
3575
        # else, this seems good enough though.
 
3576
        self.assertEquals(['', 'baz', 'bar/baz'],
 
3577
                          [s.locals['relpath'] for _, s in sections])
 
3578
 
 
3579
    def test_respect_order(self):
 
3580
        self.assertSectionIDs(['/foo', '/foo/b*', '/foo/*/baz'],
 
3581
                              '/foo/bar/baz', '''\
 
3582
[/foo/*/baz]
 
3583
[/foo/qux]
 
3584
[/foo/b*]
 
3585
[/foo]
 
3586
''')
 
3587
 
 
3588
 
 
3589
class TestNameMatcher(TestStore):
 
3590
 
 
3591
    def setUp(self):
 
3592
        super(TestNameMatcher, self).setUp()
 
3593
        self.matcher = config.NameMatcher
 
3594
        # Any simple store is good enough
 
3595
        self.get_store = config.test_store_builder_registry.get('configobj')
 
3596
 
 
3597
    def get_matching_sections(self, name):
 
3598
        store = self.get_store(self)
 
3599
        store._load_from_string('''
 
3600
[foo]
 
3601
option=foo
 
3602
[foo/baz]
 
3603
option=foo/baz
 
3604
[bar]
 
3605
option=bar
 
3606
''')
 
3607
        matcher = self.matcher(store, name)
 
3608
        return list(matcher.get_sections())
 
3609
 
 
3610
    def test_matching(self):
 
3611
        sections = self.get_matching_sections('foo')
 
3612
        self.assertLength(1, sections)
 
3613
        self.assertSectionContent(('foo', {'option': 'foo'}), sections[0])
 
3614
 
 
3615
    def test_not_matching(self):
 
3616
        sections = self.get_matching_sections('baz')
 
3617
        self.assertLength(0, sections)
 
3618
 
 
3619
 
 
3620
class TestBaseStackGet(tests.TestCase):
 
3621
 
 
3622
    def setUp(self):
 
3623
        super(TestBaseStackGet, self).setUp()
2876
3624
        self.overrideAttr(config, 'option_registry', config.OptionRegistry())
2877
3625
 
2878
 
    def test_single_config_get(self):
2879
 
        conf = dict(foo='bar')
2880
 
        conf_stack = config.Stack([conf])
2881
 
        self.assertEquals('bar', conf_stack.get('foo'))
 
3626
    def test_get_first_definition(self):
 
3627
        store1 = config.IniFileStore()
 
3628
        store1._load_from_string('foo=bar')
 
3629
        store2 = config.IniFileStore()
 
3630
        store2._load_from_string('foo=baz')
 
3631
        conf = config.Stack([store1.get_sections, store2.get_sections])
 
3632
        self.assertEquals('bar', conf.get('foo'))
2882
3633
 
2883
3634
    def test_get_with_registered_default_value(self):
2884
 
        conf_stack = config.Stack([dict()])
2885
 
        opt = config.Option('foo', default='bar')
2886
 
        self.overrideOptionRegistry()
2887
 
        config.option_registry.register('foo', opt)
 
3635
        config.option_registry.register(config.Option('foo', default='bar'))
 
3636
        conf_stack = config.Stack([])
2888
3637
        self.assertEquals('bar', conf_stack.get('foo'))
2889
3638
 
2890
3639
    def test_get_without_registered_default_value(self):
2891
 
        conf_stack = config.Stack([dict()])
2892
 
        opt = config.Option('foo')
2893
 
        self.overrideOptionRegistry()
2894
 
        config.option_registry.register('foo', opt)
 
3640
        config.option_registry.register(config.Option('foo'))
 
3641
        conf_stack = config.Stack([])
2895
3642
        self.assertEquals(None, conf_stack.get('foo'))
2896
3643
 
2897
3644
    def test_get_without_default_value_for_not_registered(self):
2898
 
        conf_stack = config.Stack([dict()])
2899
 
        opt = config.Option('foo')
2900
 
        self.overrideOptionRegistry()
 
3645
        conf_stack = config.Stack([])
2901
3646
        self.assertEquals(None, conf_stack.get('foo'))
2902
3647
 
2903
 
    def test_get_first_definition(self):
2904
 
        conf1 = dict(foo='bar')
2905
 
        conf2 = dict(foo='baz')
2906
 
        conf_stack = config.Stack([conf1, conf2])
2907
 
        self.assertEquals('bar', conf_stack.get('foo'))
2908
 
 
2909
 
    def test_get_embedded_definition(self):
2910
 
        conf1 = dict(yy='12')
2911
 
        conf2 = config.Stack([dict(xx='42'), dict(foo='baz')])
2912
 
        conf_stack = config.Stack([conf1, conf2])
2913
 
        self.assertEquals('baz', conf_stack.get('foo'))
2914
 
 
2915
3648
    def test_get_for_empty_section_callable(self):
2916
3649
        conf_stack = config.Stack([lambda : []])
2917
3650
        self.assertEquals(None, conf_stack.get('foo'))
2918
3651
 
2919
3652
    def test_get_for_broken_callable(self):
2920
3653
        # Trying to use and invalid callable raises an exception on first use
2921
 
        conf_stack = config.Stack([lambda : object()])
 
3654
        conf_stack = config.Stack([object])
2922
3655
        self.assertRaises(TypeError, conf_stack.get, 'foo')
2923
3656
 
2924
3657
 
 
3658
class TestStackWithSimpleStore(tests.TestCase):
 
3659
 
 
3660
    def setUp(self):
 
3661
        super(TestStackWithSimpleStore, self).setUp()
 
3662
        self.overrideAttr(config, 'option_registry', config.OptionRegistry())
 
3663
        self.registry = config.option_registry
 
3664
 
 
3665
    def get_conf(self, content=None):
 
3666
        return config.MemoryStack(content)
 
3667
 
 
3668
    def test_override_value_from_env(self):
 
3669
        self.overrideEnv('FOO', None)
 
3670
        self.registry.register(
 
3671
            config.Option('foo', default='bar', override_from_env=['FOO']))
 
3672
        self.overrideEnv('FOO', 'quux')
 
3673
        # Env variable provides a default taking over the option one
 
3674
        conf = self.get_conf('foo=store')
 
3675
        self.assertEquals('quux', conf.get('foo'))
 
3676
 
 
3677
    def test_first_override_value_from_env_wins(self):
 
3678
        self.overrideEnv('NO_VALUE', None)
 
3679
        self.overrideEnv('FOO', None)
 
3680
        self.overrideEnv('BAZ', None)
 
3681
        self.registry.register(
 
3682
            config.Option('foo', default='bar',
 
3683
                          override_from_env=['NO_VALUE', 'FOO', 'BAZ']))
 
3684
        self.overrideEnv('FOO', 'foo')
 
3685
        self.overrideEnv('BAZ', 'baz')
 
3686
        # The first env var set wins
 
3687
        conf = self.get_conf('foo=store')
 
3688
        self.assertEquals('foo', conf.get('foo'))
 
3689
 
 
3690
 
 
3691
class TestMemoryStack(tests.TestCase):
 
3692
 
 
3693
    def test_get(self):
 
3694
        conf = config.MemoryStack('foo=bar')
 
3695
        self.assertEquals('bar', conf.get('foo'))
 
3696
 
 
3697
    def test_set(self):
 
3698
        conf = config.MemoryStack('foo=bar')
 
3699
        conf.set('foo', 'baz')
 
3700
        self.assertEquals('baz', conf.get('foo'))
 
3701
 
 
3702
    def test_no_content(self):
 
3703
        conf = config.MemoryStack()
 
3704
        # No content means no loading
 
3705
        self.assertFalse(conf.store.is_loaded())
 
3706
        self.assertRaises(NotImplementedError, conf.get, 'foo')
 
3707
        # But a content can still be provided
 
3708
        conf.store._load_from_string('foo=bar')
 
3709
        self.assertEquals('bar', conf.get('foo'))
 
3710
 
 
3711
 
 
3712
class TestStackIterSections(tests.TestCase):
 
3713
 
 
3714
    def test_empty_stack(self):
 
3715
        conf = config.Stack([])
 
3716
        sections = list(conf.iter_sections())
 
3717
        self.assertLength(0, sections)
 
3718
 
 
3719
    def test_empty_store(self):
 
3720
        store = config.IniFileStore()
 
3721
        store._load_from_string('')
 
3722
        conf = config.Stack([store.get_sections])
 
3723
        sections = list(conf.iter_sections())
 
3724
        self.assertLength(0, sections)
 
3725
 
 
3726
    def test_simple_store(self):
 
3727
        store = config.IniFileStore()
 
3728
        store._load_from_string('foo=bar')
 
3729
        conf = config.Stack([store.get_sections])
 
3730
        tuples = list(conf.iter_sections())
 
3731
        self.assertLength(1, tuples)
 
3732
        (found_store, found_section) = tuples[0]
 
3733
        self.assertIs(store, found_store)
 
3734
 
 
3735
    def test_two_stores(self):
 
3736
        store1 = config.IniFileStore()
 
3737
        store1._load_from_string('foo=bar')
 
3738
        store2 = config.IniFileStore()
 
3739
        store2._load_from_string('bar=qux')
 
3740
        conf = config.Stack([store1.get_sections, store2.get_sections])
 
3741
        tuples = list(conf.iter_sections())
 
3742
        self.assertLength(2, tuples)
 
3743
        self.assertIs(store1, tuples[0][0])
 
3744
        self.assertIs(store2, tuples[1][0])
 
3745
 
 
3746
 
2925
3747
class TestStackWithTransport(tests.TestCaseWithTransport):
2926
3748
 
2927
3749
    scenarios = [(key, {'get_stack': builder}) for key, builder
2932
3754
 
2933
3755
    def test_build_stack(self):
2934
3756
        # Just a smoke test to help debug builders
2935
 
        stack = self.get_stack(self)
 
3757
        self.get_stack(self)
2936
3758
 
2937
3759
 
2938
3760
class TestStackGet(TestStackWithTransport):
2945
3767
        self.assertEquals(None, self.conf.get('foo'))
2946
3768
 
2947
3769
    def test_get_hook(self):
2948
 
        self.conf.store._load_from_string('foo=bar')
 
3770
        self.conf.set('foo', 'bar')
2949
3771
        calls = []
2950
3772
        def hook(*args):
2951
3773
            calls.append(args)
2957
3779
        self.assertEquals((self.conf, 'foo', 'bar'), calls[0])
2958
3780
 
2959
3781
 
2960
 
class TestStackGetWithConverter(TestStackGet):
 
3782
class TestStackGetWithConverter(tests.TestCase):
2961
3783
 
2962
3784
    def setUp(self):
2963
3785
        super(TestStackGetWithConverter, self).setUp()
2964
3786
        self.overrideAttr(config, 'option_registry', config.OptionRegistry())
2965
3787
        self.registry = config.option_registry
2966
3788
 
2967
 
    def register_bool_option(self, name, default, invalid=None):
2968
 
        b = config.Option(name, default=default, help='A boolean.',
2969
 
                          from_unicode=config.bool_from_store,
2970
 
                          invalid=invalid)
 
3789
    def get_conf(self, content=None):
 
3790
        return config.MemoryStack(content)
 
3791
 
 
3792
    def register_bool_option(self, name, default=None, default_from_env=None):
 
3793
        b = config.Option(name, help='A boolean.',
 
3794
                          default=default, default_from_env=default_from_env,
 
3795
                          from_unicode=config.bool_from_store)
2971
3796
        self.registry.register(b)
2972
3797
 
2973
 
    def test_get_with_bool_not_defined_default_true(self):
2974
 
        self.register_bool_option('foo', True)
2975
 
        self.assertEquals(True, self.conf.get('foo'))
2976
 
 
2977
 
    def test_get_with_bool_not_defined_default_false(self):
2978
 
        self.register_bool_option('foo', False)
2979
 
        self.assertEquals(False, self.conf.get('foo'))
2980
 
 
2981
 
    def test_get_with_bool_converter_not_default(self):
2982
 
        self.register_bool_option('foo', False)
2983
 
        self.conf.store._load_from_string('foo=yes')
2984
 
        self.assertEquals(True, self.conf.get('foo'))
2985
 
 
2986
 
    def test_get_with_bool_converter_invalid_string(self):
2987
 
        self.register_bool_option('foo', False)
2988
 
        self.conf.store._load_from_string('foo=not-a-boolean')
2989
 
        self.assertEquals(False, self.conf.get('foo'))
2990
 
 
2991
 
    def test_get_with_bool_converter_invalid_list(self):
2992
 
        self.register_bool_option('foo', False)
2993
 
        self.conf.store._load_from_string('foo=not,a,boolean')
2994
 
        self.assertEquals(False, self.conf.get('foo'))
2995
 
 
2996
 
    def test_get_invalid_warns(self):
2997
 
        self.register_bool_option('foo', False, invalid='warning')
2998
 
        self.conf.store._load_from_string('foo=not-a-boolean')
2999
 
        warnings = []
3000
 
        def warning(*args):
3001
 
            warnings.append(args[0] % args[1:])
3002
 
        self.overrideAttr(trace, 'warning', warning)
3003
 
        self.assertEquals(False, self.conf.get('foo'))
3004
 
        self.assertLength(1, warnings)
3005
 
        self.assertEquals('Value "not-a-boolean" is not valid for "foo"',
3006
 
                          warnings[0])
3007
 
 
3008
 
    def test_get_invalid_errors(self):
3009
 
        self.register_bool_option('foo', False, invalid='error')
3010
 
        self.conf.store._load_from_string('foo=not-a-boolean')
3011
 
        self.assertRaises(errors.ConfigOptionValueError, self.conf.get, 'foo')
3012
 
 
3013
 
    def register_integer_option(self, name, default):
3014
 
        i = config.Option(name, default=default, help='An integer.',
 
3798
    def test_get_default_bool_None(self):
 
3799
        self.register_bool_option('foo')
 
3800
        conf = self.get_conf('')
 
3801
        self.assertEquals(None, conf.get('foo'))
 
3802
 
 
3803
    def test_get_default_bool_True(self):
 
3804
        self.register_bool_option('foo', u'True')
 
3805
        conf = self.get_conf('')
 
3806
        self.assertEquals(True, conf.get('foo'))
 
3807
 
 
3808
    def test_get_default_bool_False(self):
 
3809
        self.register_bool_option('foo', False)
 
3810
        conf = self.get_conf('')
 
3811
        self.assertEquals(False, conf.get('foo'))
 
3812
 
 
3813
    def test_get_default_bool_False_as_string(self):
 
3814
        self.register_bool_option('foo', u'False')
 
3815
        conf = self.get_conf('')
 
3816
        self.assertEquals(False, conf.get('foo'))
 
3817
 
 
3818
    def test_get_default_bool_from_env_converted(self):
 
3819
        self.register_bool_option('foo', u'True', default_from_env=['FOO'])
 
3820
        self.overrideEnv('FOO', 'False')
 
3821
        conf = self.get_conf('')
 
3822
        self.assertEquals(False, conf.get('foo'))
 
3823
 
 
3824
    def test_get_default_bool_when_conversion_fails(self):
 
3825
        self.register_bool_option('foo', default='True')
 
3826
        conf = self.get_conf('foo=invalid boolean')
 
3827
        self.assertEquals(True, conf.get('foo'))
 
3828
 
 
3829
    def register_integer_option(self, name,
 
3830
                                default=None, default_from_env=None):
 
3831
        i = config.Option(name, help='An integer.',
 
3832
                          default=default, default_from_env=default_from_env,
3015
3833
                          from_unicode=config.int_from_store)
3016
3834
        self.registry.register(i)
3017
3835
 
3018
 
    def test_get_with_integer_not_defined_returns_default(self):
3019
 
        self.register_integer_option('foo', 42)
3020
 
        self.assertEquals(42, self.conf.get('foo'))
3021
 
 
3022
 
    def test_get_with_integer_converter_not_default(self):
3023
 
        self.register_integer_option('foo', 42)
3024
 
        self.conf.store._load_from_string('foo=16')
3025
 
        self.assertEquals(16, self.conf.get('foo'))
3026
 
 
3027
 
    def test_get_with_integer_converter_invalid_string(self):
3028
 
        # We don't set a default value
3029
 
        self.register_integer_option('foo', None)
3030
 
        self.conf.store._load_from_string('foo=forty-two')
3031
 
        # No default value, so we should get None
3032
 
        self.assertEquals(None, self.conf.get('foo'))
3033
 
 
3034
 
    def test_get_with_integer_converter_invalid_list(self):
3035
 
        # We don't set a default value
3036
 
        self.register_integer_option('foo', None)
3037
 
        self.conf.store._load_from_string('foo=a,list')
3038
 
        # No default value, so we should get None
3039
 
        self.assertEquals(None, self.conf.get('foo'))
3040
 
 
3041
 
    def register_list_option(self, name, default):
3042
 
        l = config.Option(name, default=default, help='A list.',
3043
 
                          from_unicode=config.list_from_store)
 
3836
    def test_get_default_integer_None(self):
 
3837
        self.register_integer_option('foo')
 
3838
        conf = self.get_conf('')
 
3839
        self.assertEquals(None, conf.get('foo'))
 
3840
 
 
3841
    def test_get_default_integer(self):
 
3842
        self.register_integer_option('foo', 42)
 
3843
        conf = self.get_conf('')
 
3844
        self.assertEquals(42, conf.get('foo'))
 
3845
 
 
3846
    def test_get_default_integer_as_string(self):
 
3847
        self.register_integer_option('foo', u'42')
 
3848
        conf = self.get_conf('')
 
3849
        self.assertEquals(42, conf.get('foo'))
 
3850
 
 
3851
    def test_get_default_integer_from_env(self):
 
3852
        self.register_integer_option('foo', default_from_env=['FOO'])
 
3853
        self.overrideEnv('FOO', '18')
 
3854
        conf = self.get_conf('')
 
3855
        self.assertEquals(18, conf.get('foo'))
 
3856
 
 
3857
    def test_get_default_integer_when_conversion_fails(self):
 
3858
        self.register_integer_option('foo', default='12')
 
3859
        conf = self.get_conf('foo=invalid integer')
 
3860
        self.assertEquals(12, conf.get('foo'))
 
3861
 
 
3862
    def register_list_option(self, name, default=None, default_from_env=None):
 
3863
        l = config.ListOption(name, help='A list.', default=default,
 
3864
                              default_from_env=default_from_env)
3044
3865
        self.registry.register(l)
3045
3866
 
3046
 
    def test_get_with_list_not_defined_returns_default(self):
3047
 
        self.register_list_option('foo', [])
3048
 
        self.assertEquals([], self.conf.get('foo'))
3049
 
 
3050
 
    def test_get_with_list_converter_nothing(self):
3051
 
        self.register_list_option('foo', [1])
3052
 
        self.conf.store._load_from_string('foo=')
3053
 
        self.assertEquals([], self.conf.get('foo'))
 
3867
    def test_get_default_list_None(self):
 
3868
        self.register_list_option('foo')
 
3869
        conf = self.get_conf('')
 
3870
        self.assertEquals(None, conf.get('foo'))
 
3871
 
 
3872
    def test_get_default_list_empty(self):
 
3873
        self.register_list_option('foo', '')
 
3874
        conf = self.get_conf('')
 
3875
        self.assertEquals([], conf.get('foo'))
 
3876
 
 
3877
    def test_get_default_list_from_env(self):
 
3878
        self.register_list_option('foo', default_from_env=['FOO'])
 
3879
        self.overrideEnv('FOO', '')
 
3880
        conf = self.get_conf('')
 
3881
        self.assertEquals([], conf.get('foo'))
3054
3882
 
3055
3883
    def test_get_with_list_converter_no_item(self):
3056
 
        self.register_list_option('foo', [1])
3057
 
        self.conf.store._load_from_string('foo=,')
3058
 
        self.assertEquals([], self.conf.get('foo'))
3059
 
 
3060
 
    def test_get_with_list_converter_one_boolean(self):
3061
 
        self.register_list_option('foo', [1])
3062
 
        self.conf.store._load_from_string('foo=True')
3063
 
        # We get a list of one string
3064
 
        self.assertEquals(['True'], self.conf.get('foo'))
3065
 
 
3066
 
    def test_get_with_list_converter_one_integer(self):
3067
 
        self.register_list_option('foo', [1])
3068
 
        self.conf.store._load_from_string('foo=2')
3069
 
        # We get a list of one string
3070
 
        self.assertEquals(['2'], self.conf.get('foo'))
3071
 
 
3072
 
    def test_get_with_list_converter_one_string(self):
3073
 
        self.register_list_option('foo', ['foo'])
3074
 
        self.conf.store._load_from_string('foo=bar')
3075
 
        # We get a list of one string
3076
 
        self.assertEquals(['bar'], self.conf.get('foo'))
 
3884
        self.register_list_option('foo', None)
 
3885
        conf = self.get_conf('foo=,')
 
3886
        self.assertEquals([], conf.get('foo'))
3077
3887
 
3078
3888
    def test_get_with_list_converter_many_items(self):
3079
 
        self.register_list_option('foo', [1])
3080
 
        self.conf.store._load_from_string('foo=m,o,r,e')
3081
 
        self.assertEquals(['m', 'o', 'r', 'e'], self.conf.get('foo'))
 
3889
        self.register_list_option('foo', None)
 
3890
        conf = self.get_conf('foo=m,o,r,e')
 
3891
        self.assertEquals(['m', 'o', 'r', 'e'], conf.get('foo'))
 
3892
 
 
3893
    def test_get_with_list_converter_embedded_spaces_many_items(self):
 
3894
        self.register_list_option('foo', None)
 
3895
        conf = self.get_conf('foo=" bar", "baz "')
 
3896
        self.assertEquals([' bar', 'baz '], conf.get('foo'))
 
3897
 
 
3898
    def test_get_with_list_converter_stripped_spaces_many_items(self):
 
3899
        self.register_list_option('foo', None)
 
3900
        conf = self.get_conf('foo= bar ,  baz ')
 
3901
        self.assertEquals(['bar', 'baz'], conf.get('foo'))
 
3902
 
 
3903
 
 
3904
class TestIterOptionRefs(tests.TestCase):
 
3905
    """iter_option_refs is a bit unusual, document some cases."""
 
3906
 
 
3907
    def assertRefs(self, expected, string):
 
3908
        self.assertEquals(expected, list(config.iter_option_refs(string)))
 
3909
 
 
3910
    def test_empty(self):
 
3911
        self.assertRefs([(False, '')], '')
 
3912
 
 
3913
    def test_no_refs(self):
 
3914
        self.assertRefs([(False, 'foo bar')], 'foo bar')
 
3915
 
 
3916
    def test_single_ref(self):
 
3917
        self.assertRefs([(False, ''), (True, '{foo}'), (False, '')], '{foo}')
 
3918
 
 
3919
    def test_broken_ref(self):
 
3920
        self.assertRefs([(False, '{foo')], '{foo')
 
3921
 
 
3922
    def test_embedded_ref(self):
 
3923
        self.assertRefs([(False, '{'), (True, '{foo}'), (False, '}')],
 
3924
                        '{{foo}}')
 
3925
 
 
3926
    def test_two_refs(self):
 
3927
        self.assertRefs([(False, ''), (True, '{foo}'),
 
3928
                         (False, ''), (True, '{bar}'),
 
3929
                         (False, ''),],
 
3930
                        '{foo}{bar}')
 
3931
 
 
3932
    def test_newline_in_refs_are_not_matched(self):
 
3933
        self.assertRefs([(False, '{\nxx}{xx\n}{{\n}}')], '{\nxx}{xx\n}{{\n}}')
 
3934
 
 
3935
 
 
3936
class TestStackExpandOptions(tests.TestCaseWithTransport):
 
3937
 
 
3938
    def setUp(self):
 
3939
        super(TestStackExpandOptions, self).setUp()
 
3940
        self.overrideAttr(config, 'option_registry', config.OptionRegistry())
 
3941
        self.registry = config.option_registry
 
3942
        store = config.TransportIniFileStore(self.get_transport(), 'foo.conf')
 
3943
        self.conf = config.Stack([store.get_sections], store)
 
3944
 
 
3945
    def assertExpansion(self, expected, string, env=None):
 
3946
        self.assertEquals(expected, self.conf.expand_options(string, env))
 
3947
 
 
3948
    def test_no_expansion(self):
 
3949
        self.assertExpansion('foo', 'foo')
 
3950
 
 
3951
    def test_expand_default_value(self):
 
3952
        self.conf.store._load_from_string('bar=baz')
 
3953
        self.registry.register(config.Option('foo', default=u'{bar}'))
 
3954
        self.assertEquals('baz', self.conf.get('foo', expand=True))
 
3955
 
 
3956
    def test_expand_default_from_env(self):
 
3957
        self.conf.store._load_from_string('bar=baz')
 
3958
        self.registry.register(config.Option('foo', default_from_env=['FOO']))
 
3959
        self.overrideEnv('FOO', '{bar}')
 
3960
        self.assertEquals('baz', self.conf.get('foo', expand=True))
 
3961
 
 
3962
    def test_expand_default_on_failed_conversion(self):
 
3963
        self.conf.store._load_from_string('baz=bogus\nbar=42\nfoo={baz}')
 
3964
        self.registry.register(
 
3965
            config.Option('foo', default=u'{bar}',
 
3966
                          from_unicode=config.int_from_store))
 
3967
        self.assertEquals(42, self.conf.get('foo', expand=True))
 
3968
 
 
3969
    def test_env_adding_options(self):
 
3970
        self.assertExpansion('bar', '{foo}', {'foo': 'bar'})
 
3971
 
 
3972
    def test_env_overriding_options(self):
 
3973
        self.conf.store._load_from_string('foo=baz')
 
3974
        self.assertExpansion('bar', '{foo}', {'foo': 'bar'})
 
3975
 
 
3976
    def test_simple_ref(self):
 
3977
        self.conf.store._load_from_string('foo=xxx')
 
3978
        self.assertExpansion('xxx', '{foo}')
 
3979
 
 
3980
    def test_unknown_ref(self):
 
3981
        self.assertRaises(errors.ExpandingUnknownOption,
 
3982
                          self.conf.expand_options, '{foo}')
 
3983
 
 
3984
    def test_illegal_def_is_ignored(self):
 
3985
        self.assertExpansion('{1,2}', '{1,2}')
 
3986
        self.assertExpansion('{ }', '{ }')
 
3987
        self.assertExpansion('${Foo,f}', '${Foo,f}')
 
3988
 
 
3989
    def test_indirect_ref(self):
 
3990
        self.conf.store._load_from_string('''
 
3991
foo=xxx
 
3992
bar={foo}
 
3993
''')
 
3994
        self.assertExpansion('xxx', '{bar}')
 
3995
 
 
3996
    def test_embedded_ref(self):
 
3997
        self.conf.store._load_from_string('''
 
3998
foo=xxx
 
3999
bar=foo
 
4000
''')
 
4001
        self.assertExpansion('xxx', '{{bar}}')
 
4002
 
 
4003
    def test_simple_loop(self):
 
4004
        self.conf.store._load_from_string('foo={foo}')
 
4005
        self.assertRaises(errors.OptionExpansionLoop,
 
4006
                          self.conf.expand_options, '{foo}')
 
4007
 
 
4008
    def test_indirect_loop(self):
 
4009
        self.conf.store._load_from_string('''
 
4010
foo={bar}
 
4011
bar={baz}
 
4012
baz={foo}''')
 
4013
        e = self.assertRaises(errors.OptionExpansionLoop,
 
4014
                              self.conf.expand_options, '{foo}')
 
4015
        self.assertEquals('foo->bar->baz', e.refs)
 
4016
        self.assertEquals('{foo}', e.string)
 
4017
 
 
4018
    def test_list(self):
 
4019
        self.conf.store._load_from_string('''
 
4020
foo=start
 
4021
bar=middle
 
4022
baz=end
 
4023
list={foo},{bar},{baz}
 
4024
''')
 
4025
        self.registry.register(
 
4026
            config.ListOption('list'))
 
4027
        self.assertEquals(['start', 'middle', 'end'],
 
4028
                           self.conf.get('list', expand=True))
 
4029
 
 
4030
    def test_cascading_list(self):
 
4031
        self.conf.store._load_from_string('''
 
4032
foo=start,{bar}
 
4033
bar=middle,{baz}
 
4034
baz=end
 
4035
list={foo}
 
4036
''')
 
4037
        self.registry.register(config.ListOption('list'))
 
4038
        # Register an intermediate option as a list to ensure no conversion
 
4039
        # happen while expanding. Conversion should only occur for the original
 
4040
        # option ('list' here).
 
4041
        self.registry.register(config.ListOption('baz'))
 
4042
        self.assertEquals(['start', 'middle', 'end'],
 
4043
                           self.conf.get('list', expand=True))
 
4044
 
 
4045
    def test_pathologically_hidden_list(self):
 
4046
        self.conf.store._load_from_string('''
 
4047
foo=bin
 
4048
bar=go
 
4049
start={foo
 
4050
middle=},{
 
4051
end=bar}
 
4052
hidden={start}{middle}{end}
 
4053
''')
 
4054
        # What matters is what the registration says, the conversion happens
 
4055
        # only after all expansions have been performed
 
4056
        self.registry.register(config.ListOption('hidden'))
 
4057
        self.assertEquals(['bin', 'go'],
 
4058
                          self.conf.get('hidden', expand=True))
 
4059
 
 
4060
 
 
4061
class TestStackCrossSectionsExpand(tests.TestCaseWithTransport):
 
4062
 
 
4063
    def setUp(self):
 
4064
        super(TestStackCrossSectionsExpand, self).setUp()
 
4065
 
 
4066
    def get_config(self, location, string):
 
4067
        if string is None:
 
4068
            string = ''
 
4069
        # Since we don't save the config we won't strictly require to inherit
 
4070
        # from TestCaseInTempDir, but an error occurs so quickly...
 
4071
        c = config.LocationStack(location)
 
4072
        c.store._load_from_string(string)
 
4073
        return c
 
4074
 
 
4075
    def test_dont_cross_unrelated_section(self):
 
4076
        c = self.get_config('/another/branch/path','''
 
4077
[/one/branch/path]
 
4078
foo = hello
 
4079
bar = {foo}/2
 
4080
 
 
4081
[/another/branch/path]
 
4082
bar = {foo}/2
 
4083
''')
 
4084
        self.assertRaises(errors.ExpandingUnknownOption,
 
4085
                          c.get, 'bar', expand=True)
 
4086
 
 
4087
    def test_cross_related_sections(self):
 
4088
        c = self.get_config('/project/branch/path','''
 
4089
[/project]
 
4090
foo = qu
 
4091
 
 
4092
[/project/branch/path]
 
4093
bar = {foo}ux
 
4094
''')
 
4095
        self.assertEquals('quux', c.get('bar', expand=True))
 
4096
 
 
4097
 
 
4098
class TestStackCrossStoresExpand(tests.TestCaseWithTransport):
 
4099
 
 
4100
    def test_cross_global_locations(self):
 
4101
        l_store = config.LocationStore()
 
4102
        l_store._load_from_string('''
 
4103
[/branch]
 
4104
lfoo = loc-foo
 
4105
lbar = {gbar}
 
4106
''')
 
4107
        l_store.save()
 
4108
        g_store = config.GlobalStore()
 
4109
        g_store._load_from_string('''
 
4110
[DEFAULT]
 
4111
gfoo = {lfoo}
 
4112
gbar = glob-bar
 
4113
''')
 
4114
        g_store.save()
 
4115
        stack = config.LocationStack('/branch')
 
4116
        self.assertEquals('glob-bar', stack.get('lbar', expand=True))
 
4117
        self.assertEquals('loc-foo', stack.get('gfoo', expand=True))
 
4118
 
 
4119
 
 
4120
class TestStackExpandSectionLocals(tests.TestCaseWithTransport):
 
4121
 
 
4122
    def test_expand_locals_empty(self):
 
4123
        l_store = config.LocationStore()
 
4124
        l_store._load_from_string('''
 
4125
[/home/user/project]
 
4126
base = {basename}
 
4127
rel = {relpath}
 
4128
''')
 
4129
        l_store.save()
 
4130
        stack = config.LocationStack('/home/user/project/')
 
4131
        self.assertEquals('', stack.get('base', expand=True))
 
4132
        self.assertEquals('', stack.get('rel', expand=True))
 
4133
 
 
4134
    def test_expand_basename_locally(self):
 
4135
        l_store = config.LocationStore()
 
4136
        l_store._load_from_string('''
 
4137
[/home/user/project]
 
4138
bfoo = {basename}
 
4139
''')
 
4140
        l_store.save()
 
4141
        stack = config.LocationStack('/home/user/project/branch')
 
4142
        self.assertEquals('branch', stack.get('bfoo', expand=True))
 
4143
 
 
4144
    def test_expand_basename_locally_longer_path(self):
 
4145
        l_store = config.LocationStore()
 
4146
        l_store._load_from_string('''
 
4147
[/home/user]
 
4148
bfoo = {basename}
 
4149
''')
 
4150
        l_store.save()
 
4151
        stack = config.LocationStack('/home/user/project/dir/branch')
 
4152
        self.assertEquals('branch', stack.get('bfoo', expand=True))
 
4153
 
 
4154
    def test_expand_relpath_locally(self):
 
4155
        l_store = config.LocationStore()
 
4156
        l_store._load_from_string('''
 
4157
[/home/user/project]
 
4158
lfoo = loc-foo/{relpath}
 
4159
''')
 
4160
        l_store.save()
 
4161
        stack = config.LocationStack('/home/user/project/branch')
 
4162
        self.assertEquals('loc-foo/branch', stack.get('lfoo', expand=True))
 
4163
 
 
4164
    def test_expand_relpath_unknonw_in_global(self):
 
4165
        g_store = config.GlobalStore()
 
4166
        g_store._load_from_string('''
 
4167
[DEFAULT]
 
4168
gfoo = {relpath}
 
4169
''')
 
4170
        g_store.save()
 
4171
        stack = config.LocationStack('/home/user/project/branch')
 
4172
        self.assertRaises(errors.ExpandingUnknownOption,
 
4173
                          stack.get, 'gfoo', expand=True)
 
4174
 
 
4175
    def test_expand_local_option_locally(self):
 
4176
        l_store = config.LocationStore()
 
4177
        l_store._load_from_string('''
 
4178
[/home/user/project]
 
4179
lfoo = loc-foo/{relpath}
 
4180
lbar = {gbar}
 
4181
''')
 
4182
        l_store.save()
 
4183
        g_store = config.GlobalStore()
 
4184
        g_store._load_from_string('''
 
4185
[DEFAULT]
 
4186
gfoo = {lfoo}
 
4187
gbar = glob-bar
 
4188
''')
 
4189
        g_store.save()
 
4190
        stack = config.LocationStack('/home/user/project/branch')
 
4191
        self.assertEquals('glob-bar', stack.get('lbar', expand=True))
 
4192
        self.assertEquals('loc-foo/branch', stack.get('gfoo', expand=True))
 
4193
 
 
4194
    def test_locals_dont_leak(self):
 
4195
        """Make sure we chose the right local in presence of several sections.
 
4196
        """
 
4197
        l_store = config.LocationStore()
 
4198
        l_store._load_from_string('''
 
4199
[/home/user]
 
4200
lfoo = loc-foo/{relpath}
 
4201
[/home/user/project]
 
4202
lfoo = loc-foo/{relpath}
 
4203
''')
 
4204
        l_store.save()
 
4205
        stack = config.LocationStack('/home/user/project/branch')
 
4206
        self.assertEquals('loc-foo/branch', stack.get('lfoo', expand=True))
 
4207
        stack = config.LocationStack('/home/user/bar/baz')
 
4208
        self.assertEquals('loc-foo/bar/baz', stack.get('lfoo', expand=True))
 
4209
 
3082
4210
 
3083
4211
 
3084
4212
class TestStackSet(TestStackWithTransport):
3085
4213
 
3086
4214
    def test_simple_set(self):
3087
4215
        conf = self.get_stack(self)
3088
 
        conf.store._load_from_string('foo=bar')
3089
 
        self.assertEquals('bar', conf.get('foo'))
 
4216
        self.assertEquals(None, conf.get('foo'))
3090
4217
        conf.set('foo', 'baz')
3091
4218
        # Did we get it back ?
3092
4219
        self.assertEquals('baz', conf.get('foo'))
3112
4239
 
3113
4240
    def test_remove_existing(self):
3114
4241
        conf = self.get_stack(self)
3115
 
        conf.store._load_from_string('foo=bar')
 
4242
        conf.set('foo', 'bar')
3116
4243
        self.assertEquals('bar', conf.get('foo'))
3117
4244
        conf.remove('foo')
3118
4245
        # Did we get it back ?
3129
4256
        config.ConfigHooks.install_named_hook('remove', hook, None)
3130
4257
        self.assertLength(0, calls)
3131
4258
        conf = self.get_stack(self)
3132
 
        conf.store._load_from_string('foo=bar')
 
4259
        conf.set('foo', 'bar')
3133
4260
        conf.remove('foo')
3134
4261
        self.assertLength(1, calls)
3135
4262
        self.assertEquals((conf, 'foo'), calls[0])
3236
4363
        """
3237
4364
        sections = list(conf._get_sections(name))
3238
4365
        self.assertLength(len(expected), sections)
3239
 
        self.assertEqual(expected, [name for name, _, _ in sections])
 
4366
        self.assertEqual(expected, [n for n, _, _ in sections])
3240
4367
 
3241
4368
    def test_bazaar_default_section(self):
3242
4369
        self.assertSectionNames(['DEFAULT'], self.bazaar_config)
3286
4413
        self.assertSectionNames(['ALIASES'], self.bazaar_config, 'ALIASES')
3287
4414
 
3288
4415
 
 
4416
class TestSharedStores(tests.TestCaseInTempDir):
 
4417
 
 
4418
    def test_bazaar_conf_shared(self):
 
4419
        g1 = config.GlobalStack()
 
4420
        g2 = config.GlobalStack()
 
4421
        # The two stacks share the same store
 
4422
        self.assertIs(g1.store, g2.store)
 
4423
 
 
4424
 
3289
4425
class TestAuthenticationConfigFile(tests.TestCase):
3290
4426
    """Test the authentication.conf file matching"""
3291
4427
 
3506
4642
                                           port=99, path='/foo',
3507
4643
                                           realm='realm')
3508
4644
        CREDENTIALS = {'name': 'name', 'user': 'user', 'password': 'password',
3509
 
                       'verify_certificates': False, 'scheme': 'scheme', 
3510
 
                       'host': 'host', 'port': 99, 'path': '/foo', 
 
4645
                       'verify_certificates': False, 'scheme': 'scheme',
 
4646
                       'host': 'host', 'port': 99, 'path': '/foo',
3511
4647
                       'realm': 'realm'}
3512
4648
        self.assertEqual(CREDENTIALS, credentials)
3513
4649
        credentials_from_disk = config.AuthenticationConfig().get_credentials(
3521
4657
        self.assertIs(None, conf._get_config().get('name'))
3522
4658
        credentials = conf.get_credentials(host='host', scheme='scheme')
3523
4659
        CREDENTIALS = {'name': 'name2', 'user': 'user2', 'password':
3524
 
                       'password', 'verify_certificates': True, 
3525
 
                       'scheme': 'scheme', 'host': 'host', 'port': None, 
 
4660
                       'password', 'verify_certificates': True,
 
4661
                       'scheme': 'scheme', 'host': 'host', 'port': None,
3526
4662
                       'path': None, 'realm': None}
3527
4663
        self.assertEqual(CREDENTIALS, credentials)
3528
4664
 
3780
4916
        self.assertEquals('secret', decoded)
3781
4917
 
3782
4918
 
 
4919
class TestBase64CredentialStore(tests.TestCase):
 
4920
 
 
4921
    def test_decode_password(self):
 
4922
        r = config.credential_store_registry
 
4923
        plain_text = r.get_credential_store('base64')
 
4924
        decoded = plain_text.decode_password(dict(password='c2VjcmV0'))
 
4925
        self.assertEquals('secret', decoded)
 
4926
 
 
4927
 
3783
4928
# FIXME: Once we have a way to declare authentication to all test servers, we
3784
4929
# can implement generic tests.
3785
4930
# test_user_password_in_url
3797
4942
 
3798
4943
    def test_auto_user_id(self):
3799
4944
        """Automatic inference of user name.
3800
 
        
 
4945
 
3801
4946
        This is a bit hard to test in an isolated way, because it depends on
3802
4947
        system functions that go direct to /etc or perhaps somewhere else.
3803
4948
        But it's reasonable to say that on Unix, with an /etc/mailname, we ought
3813
4958
        else:
3814
4959
            self.assertEquals((None, None), (realname, address))
3815
4960
 
 
4961
 
 
4962
class TestDefaultMailDomain(tests.TestCaseInTempDir):
 
4963
    """Test retrieving default domain from mailname file"""
 
4964
 
 
4965
    def test_default_mail_domain_simple(self):
 
4966
        f = file('simple', 'w')
 
4967
        try:
 
4968
            f.write("domainname.com\n")
 
4969
        finally:
 
4970
            f.close()
 
4971
        r = config._get_default_mail_domain('simple')
 
4972
        self.assertEquals('domainname.com', r)
 
4973
 
 
4974
    def test_default_mail_domain_no_eol(self):
 
4975
        f = file('no_eol', 'w')
 
4976
        try:
 
4977
            f.write("domainname.com")
 
4978
        finally:
 
4979
            f.close()
 
4980
        r = config._get_default_mail_domain('no_eol')
 
4981
        self.assertEquals('domainname.com', r)
 
4982
 
 
4983
    def test_default_mail_domain_multiple_lines(self):
 
4984
        f = file('multiple_lines', 'w')
 
4985
        try:
 
4986
            f.write("domainname.com\nsome other text\n")
 
4987
        finally:
 
4988
            f.close()
 
4989
        r = config._get_default_mail_domain('multiple_lines')
 
4990
        self.assertEquals('domainname.com', r)
 
4991
 
 
4992
 
 
4993
class EmailOptionTests(tests.TestCase):
 
4994
 
 
4995
    def test_default_email_uses_BZR_EMAIL(self):
 
4996
        conf = config.MemoryStack('email=jelmer@debian.org')
 
4997
        # BZR_EMAIL takes precedence over EMAIL
 
4998
        self.overrideEnv('BZR_EMAIL', 'jelmer@samba.org')
 
4999
        self.overrideEnv('EMAIL', 'jelmer@apache.org')
 
5000
        self.assertEquals('jelmer@samba.org', conf.get('email'))
 
5001
 
 
5002
    def test_default_email_uses_EMAIL(self):
 
5003
        conf = config.MemoryStack('')
 
5004
        self.overrideEnv('BZR_EMAIL', None)
 
5005
        self.overrideEnv('EMAIL', 'jelmer@apache.org')
 
5006
        self.assertEquals('jelmer@apache.org', conf.get('email'))
 
5007
 
 
5008
    def test_BZR_EMAIL_overrides(self):
 
5009
        conf = config.MemoryStack('email=jelmer@debian.org')
 
5010
        self.overrideEnv('BZR_EMAIL', 'jelmer@apache.org')
 
5011
        self.assertEquals('jelmer@apache.org', conf.get('email'))
 
5012
        self.overrideEnv('BZR_EMAIL', None)
 
5013
        self.overrideEnv('EMAIL', 'jelmer@samba.org')
 
5014
        self.assertEquals('jelmer@debian.org', conf.get('email'))
 
5015
 
 
5016
 
 
5017
class MailClientOptionTests(tests.TestCase):
 
5018
 
 
5019
    def test_default(self):
 
5020
        conf = config.MemoryStack('')
 
5021
        client = conf.get('mail_client')
 
5022
        self.assertIs(client, mail_client.DefaultMail)
 
5023
 
 
5024
    def test_evolution(self):
 
5025
        conf = config.MemoryStack('mail_client=evolution')
 
5026
        client = conf.get('mail_client')
 
5027
        self.assertIs(client, mail_client.Evolution)
 
5028
 
 
5029
    def test_kmail(self):
 
5030
        conf = config.MemoryStack('mail_client=kmail')
 
5031
        client = conf.get('mail_client')
 
5032
        self.assertIs(client, mail_client.KMail)
 
5033
 
 
5034
    def test_mutt(self):
 
5035
        conf = config.MemoryStack('mail_client=mutt')
 
5036
        client = conf.get('mail_client')
 
5037
        self.assertIs(client, mail_client.Mutt)
 
5038
 
 
5039
    def test_thunderbird(self):
 
5040
        conf = config.MemoryStack('mail_client=thunderbird')
 
5041
        client = conf.get('mail_client')
 
5042
        self.assertIs(client, mail_client.Thunderbird)
 
5043
 
 
5044
    def test_explicit_default(self):
 
5045
        conf = config.MemoryStack('mail_client=default')
 
5046
        client = conf.get('mail_client')
 
5047
        self.assertIs(client, mail_client.DefaultMail)
 
5048
 
 
5049
    def test_editor(self):
 
5050
        conf = config.MemoryStack('mail_client=editor')
 
5051
        client = conf.get('mail_client')
 
5052
        self.assertIs(client, mail_client.Editor)
 
5053
 
 
5054
    def test_mapi(self):
 
5055
        conf = config.MemoryStack('mail_client=mapi')
 
5056
        client = conf.get('mail_client')
 
5057
        self.assertIs(client, mail_client.MAPIClient)
 
5058
 
 
5059
    def test_xdg_email(self):
 
5060
        conf = config.MemoryStack('mail_client=xdg-email')
 
5061
        client = conf.get('mail_client')
 
5062
        self.assertIs(client, mail_client.XDGEmail)
 
5063
 
 
5064
    def test_unknown(self):
 
5065
        conf = config.MemoryStack('mail_client=firebird')
 
5066
        self.assertRaises(errors.ConfigOptionValueError, conf.get,
 
5067
                'mail_client')