~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

  • Committer: Robert Collins
  • Date: 2009-12-06 00:12:45 UTC
  • mto: This revision was merged to the branch mainline in revision 4920.
  • Revision ID: robertc@robertcollins.net-20091206001245-x1nv37nkl21xktyy
Move the passing of test logs to the result to be via the getDetails API and remove all public use of TestCase._get_log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1573
1573
        # the user is prompted
1574
1574
        self.assertEquals(entered_password,
1575
1575
                          conf.get_password('ssh', 'bar.org', user='jim'))
 
1576
        log = u"".join(self.getDetails()['log'].iter_text())
1576
1577
        self.assertContainsRe(
1577
 
            self._get_log(keep_log_file=True),
 
1578
            log,
1578
1579
            'password ignored in section \[ssh with password\]')
1579
1580
 
1580
1581
    def test_ssh_without_password_doesnt_emit_warning(self):
1598
1599
                          conf.get_password('ssh', 'bar.org', user='jim'))
1599
1600
        # No warning shoud be emitted since there is no password. We are only
1600
1601
        # providing "user".
 
1602
        log = u"".join(self.getDetails()['log'].iter_text())
1601
1603
        self.assertNotContainsRe(
1602
 
            self._get_log(keep_log_file=True),
 
1604
            log,
1603
1605
            'password ignored in section \[ssh with password\]')
1604
1606
 
1605
1607
    def test_uses_fallback_stores(self):