/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smtp_connection.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-08 13:39:32 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090508133932-4fbx4z8fvraeyjdy
Fixed as per John's and Markus reviews.

* bzrlib/tests/blackbox/test_push.py:
(TestPush.test_push_with_revisionspec): Fix wrong run_bzr_error
call. Additionnally the error regexp was wrong !

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.test_ls_path, TestLS.test_kinds): Fix wrong run_bzr_error
calls.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Add a check to catch errors in error_regexes
usage where people use a a string that it then iterated char by
char for matching (which is most certainly not the intent of the
test writer).

* bzrlib/tests/blackbox/test_log.py:
Fix run_bzr_error calls. Fix some white spaces issues (some
expected strings were using TABs and were wrongly caught by
test_coding_style(), but fixing the strings wasn't really a
problem either.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smtp_connection.py
1
 
# Copyright (C) 2005, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2007 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 = ui.CannedInputUIFactory([password])
 
139
        ui.ui_factory = tests.TestUIFactory(stdin=password + '\n',
 
140
                                            stdout=tests.StringIOWrapper())
140
141
        conn._connect()
141
142
        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())
142
145
 
143
146
    def test_smtp_password_from_auth_config(self):
144
147
        user = 'joe'