← 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: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
1641
1641
        self.assertEquals(entered_password,
1642
1642
                          conf.get_password('ssh', 'bar.org', user='jim'))
1643
1643
        self.assertContainsRe(
1644
 
            self._get_log(keep_log_file=True),
 
1644
            self.get_log(),
1645
1645
            'password ignored in section \[ssh with password\]')
1646
1646
 
1647
1647
    def test_ssh_without_password_doesnt_emit_warning(self):
1666
1666
        # No warning shoud be emitted since there is no password. We are only
1667
1667
        # providing "user".
1668
1668
        self.assertNotContainsRe(
1669
 
            self._get_log(keep_log_file=True),
 
1669
            self.get_log(),
1670
1670
            'password ignored in section \[ssh with password\]')
1671
1671
 
1672
1672
    def test_uses_fallback_stores(self):