← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-15 10:14:51 UTC
  • mto: (4396.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4397.
  • Revision ID: v.ladeuil+lp@free.fr-20090515101451-bffnsywhvaskrz1h
Use stderr for UI prompt to address bug #376582.

* bzrlib/ui/__init__.py:
(CLIUIFactory.prompt): Display prompt on stderr.

* bzrlib/tests/test_ui.py: (UITests.test_text_factory_ascii_password,
UITests.test_text_factory_utf8_password,
UITests.assert_get_bool_acceptance_of_user_input,
UITests.test_text_factory_prompt,
UITests.test_silent_ui_getusername,
UITests.test_text_ui_getusername,
UITests.test_text_ui_getusername_utf8):prompt is now displayed on
stderr.

* bzrlib/tests/test_http.py:
(TestAuth.test_prompt_for_username,
TestAuth.test_prompt_for_password): prompt is now displayed on
stderr.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig._check_default_password_prompt,
TestAuthenticationConfig._check_default_username_prompt): prompt
is now displayed on stderr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
 
2
#   Authors: Robert Collins <robert.collins@canonical.com>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
17
18
"""Tests for finding and reading the bzr config file[s]."""
18
19
# import system imports here
19
20
from cStringIO import StringIO
 
21
import getpass
20
22
import os
21
23
import sys
22
24
 
25
27
    branch,
26
28
    bzrdir,
27
29
    config,
28
 
    diff,
29
30
    errors,
30
31
    osutils,
31
32
    mail_client,
43
44
[DEFAULT]
44
45
email=Erik B\u00e5gfors <erik@bagfors.nu>
45
46
editor=vim
46
 
change_editor=vimdiff -of @new_path @old_path
47
47
gpg_signing_command=gnome-gpg
48
48
log_format=short
49
49
user_global_option=something
210
210
        self._calls.append('_get_signature_checking')
211
211
        return self._signatures
212
212
 
213
 
    def _get_change_editor(self):
214
 
        self._calls.append('_get_change_editor')
215
 
        return 'vimdiff -fo @new_path @old_path'
216
 
 
217
213
 
218
214
bool_config = """[DEFAULT]
219
215
active = true
320
316
        my_config = config.Config()
321
317
        self.assertEqual('long', my_config.log_format())
322
318
 
323
 
    def test_get_change_editor(self):
324
 
        my_config = InstrumentedConfig()
325
 
        change_editor = my_config.get_change_editor('old_tree', 'new_tree')
326
 
        self.assertEqual(['_get_change_editor'], my_config._calls)
327
 
        self.assertIs(diff.DiffFromTool, change_editor.__class__)
328
 
        self.assertEqual(['vimdiff', '-fo', '@new_path', '@old_path'],
329
 
                         change_editor.command_template)
330
 
 
331
319
 
332
320
class TestConfigPath(tests.TestCase):
333
321
 
334
322
    def setUp(self):
335
323
        super(TestConfigPath, self).setUp()
336
324
        os.environ['HOME'] = '/home/bogus'
337
 
        os.environ['XDG_CACHE_DIR'] = ''
338
325
        if sys.platform == 'win32':
339
326
            os.environ['BZR_HOME'] = \
340
327
                r'C:\Documents and Settings\bogus\Application Data'
362
349
        self.assertEqual(config.authentication_config_filename(),
363
350
                         self.bzr_home + '/authentication.conf')
364
351
 
365
 
    def test_xdg_cache_dir(self):
366
 
        self.assertEqual(config.xdg_cache_dir(),
367
 
            '/home/bogus/.cache')
368
 
 
369
352
 
370
353
class TestIniConfig(tests.TestCase):
371
354
 
372
 
    def make_config_parser(self, s):
373
 
        conf = config.IniBasedConfig(None)
374
 
        parser = conf._get_parser(file=StringIO(s.encode('utf-8')))
375
 
        return conf, parser
376
 
 
377
 
 
378
 
class TestIniConfigBuilding(TestIniConfig):
379
 
 
380
355
    def test_contructs(self):
381
356
        my_config = config.IniBasedConfig("nothing")
382
357
 
394
369
        self.failUnless(my_config._get_parser() is parser)
395
370
 
396
371
 
397
 
class TestGetUserOptionAs(TestIniConfig):
398
 
 
399
 
    def test_get_user_option_as_bool(self):
400
 
        conf, parser = self.make_config_parser("""
401
 
a_true_bool = true
402
 
a_false_bool = 0
403
 
an_invalid_bool = maybe
404
 
a_list = hmm, who knows ? # This is interpreted as a list !
405
 
""")
406
 
        get_bool = conf.get_user_option_as_bool
407
 
        self.assertEqual(True, get_bool('a_true_bool'))
408
 
        self.assertEqual(False, get_bool('a_false_bool'))
409
 
        warnings = []
410
 
        def warning(*args):
411
 
            warnings.append(args[0] % args[1:])
412
 
        self.overrideAttr(trace, 'warning', warning)
413
 
        msg = 'Value "%s" is not a boolean for "%s"'
414
 
        self.assertIs(None, get_bool('an_invalid_bool'))
415
 
        self.assertEquals(msg % ('maybe', 'an_invalid_bool'), warnings[0])
416
 
        warnings = []
417
 
        self.assertIs(None, get_bool('not_defined_in_this_config'))
418
 
        self.assertEquals([], warnings)
419
 
 
420
 
    def test_get_user_option_as_list(self):
421
 
        conf, parser = self.make_config_parser("""
422
 
a_list = a,b,c
423
 
length_1 = 1,
424
 
one_item = x
425
 
""")
426
 
        get_list = conf.get_user_option_as_list
427
 
        self.assertEqual(['a', 'b', 'c'], get_list('a_list'))
428
 
        self.assertEqual(['1'], get_list('length_1'))
429
 
        self.assertEqual('x', conf.get_user_option('one_item'))
430
 
        # automatically cast to list
431
 
        self.assertEqual(['x'], get_list('one_item'))
432
 
 
433
 
 
434
 
class TestSupressWarning(TestIniConfig):
435
 
 
436
 
    def make_warnings_config(self, s):
437
 
        conf, parser = self.make_config_parser(s)
438
 
        return conf.suppress_warning
439
 
 
440
 
    def test_suppress_warning_unknown(self):
441
 
        suppress_warning = self.make_warnings_config('')
442
 
        self.assertEqual(False, suppress_warning('unknown_warning'))
443
 
 
444
 
    def test_suppress_warning_known(self):
445
 
        suppress_warning = self.make_warnings_config('suppress_warnings=a,b')
446
 
        self.assertEqual(False, suppress_warning('c'))
447
 
        self.assertEqual(True, suppress_warning('a'))
448
 
        self.assertEqual(True, suppress_warning('b'))
449
 
 
450
 
 
451
372
class TestGetConfig(tests.TestCase):
452
373
 
453
374
    def test_constructs(self):
687
608
        my_config = self._get_sample_config()
688
609
        self.assertEqual(sample_long_alias, my_config.get_alias('ll'))
689
610
 
690
 
    def test_get_change_editor(self):
691
 
        my_config = self._get_sample_config()
692
 
        change_editor = my_config.get_change_editor('old', 'new')
693
 
        self.assertIs(diff.DiffFromTool, change_editor.__class__)
694
 
        self.assertEqual('vimdiff -of @new_path @old_path',
695
 
                         ' '.join(change_editor.command_template))
696
 
 
697
 
    def test_get_no_change_editor(self):
698
 
        my_config = self._get_empty_config()
699
 
        change_editor = my_config.get_change_editor('old', 'new')
700
 
        self.assertIs(None, change_editor)
701
 
 
702
611
 
703
612
class TestGlobalConfigSavingOptions(tests.TestCaseInTempDir):
704
613
 
1639
1548
"""))
1640
1549
        entered_password = 'typed-by-hand'
1641
1550
        stdout = tests.StringIOWrapper()
1642
 
        stderr = tests.StringIOWrapper()
1643
1551
        ui.ui_factory = tests.TestUIFactory(stdin=entered_password + '\n',
1644
 
                                            stdout=stdout, stderr=stderr)
 
1552
                                            stdout=stdout)
1645
1553
 
1646
1554
        # Since the password defined in the authentication config is ignored,
1647
1555
        # the user is prompted
1648
1556
        self.assertEquals(entered_password,
1649
1557
                          conf.get_password('ssh', 'bar.org', user='jim'))
1650
1558
        self.assertContainsRe(
1651
 
            self.get_log(),
 
1559
            self._get_log(keep_log_file=True),
1652
1560
            'password ignored in section \[ssh with password\]')
1653
1561
 
1654
1562
    def test_ssh_without_password_doesnt_emit_warning(self):
1661
1569
"""))
1662
1570
        entered_password = 'typed-by-hand'
1663
1571
        stdout = tests.StringIOWrapper()
1664
 
        stderr = tests.StringIOWrapper()
1665
1572
        ui.ui_factory = tests.TestUIFactory(stdin=entered_password + '\n',
1666
 
                                            stdout=stdout,
1667
 
                                            stderr=stderr)
 
1573
                                            stdout=stdout)
1668
1574
 
1669
1575
        # Since the password defined in the authentication config is ignored,
1670
1576
        # the user is prompted
1673
1579
        # No warning shoud be emitted since there is no password. We are only
1674
1580
        # providing "user".
1675
1581
        self.assertNotContainsRe(
1676
 
            self.get_log(),
 
1582
            self._get_log(keep_log_file=True),
1677
1583
            'password ignored in section \[ssh with password\]')
1678
1584
 
1679
1585
    def test_uses_fallback_stores(self):
1680
 
        self.overrideAttr(config, 'credential_store_registry',
1681
 
                          config.CredentialStoreRegistry())
 
1586
        self._old_cs_registry = config.credential_store_registry
 
1587
        def restore():
 
1588
            config.credential_store_registry = self._old_cs_registry
 
1589
        self.addCleanup(restore)
 
1590
        config.credential_store_registry = config.CredentialStoreRegistry()
1682
1591
        store = StubCredentialStore()
1683
1592
        store.add_credentials("http", "example.com", "joe", "secret")
1684
1593
        config.credential_store_registry.register("stub", store, fallback=True)