~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smtp_connection.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2007 Canonical Ltd
 
1
# Copyright (C) 2005, 2007, 2009 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
136
136
                                   smtp_factory=factory)
137
137
        self.assertIs(None, conn._smtp_password)
138
138
 
139
 
        ui.ui_factory = tests.TestUIFactory(stdin=password + '\n',
140
 
                                            stdout=tests.StringIOWrapper())
 
139
        ui.ui_factory = ui.CannedInputUIFactory([password])
141
140
        conn._connect()
142
141
        self.assertEqual(password, conn._smtp_password)
143
 
        # stdin should be empty (the provided password have been consumed)
144
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
145
142
 
146
143
    def test_smtp_password_from_auth_config(self):
147
144
        user = 'joe'