← 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: 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:
bzrlib/tests/test_config.py
1
 
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
2
 
#   Authors: Robert Collins <robert.collins@canonical.com>
 
1
# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
1561
1560
"""))
1562
1561
        entered_password = 'typed-by-hand'
1563
1562
        stdout = tests.StringIOWrapper()
 
1563
        stderr = tests.StringIOWrapper()
1564
1564
        ui.ui_factory = tests.TestUIFactory(stdin=entered_password + '\n',
1565
 
                                            stdout=stdout)
 
1565
                                            stdout=stdout, stderr=stderr)
1566
1566
 
1567
1567
        # Since the password defined in the authentication config is ignored,
1568
1568
        # the user is prompted
1582
1582
"""))
1583
1583
        entered_password = 'typed-by-hand'
1584
1584
        stdout = tests.StringIOWrapper()
 
1585
        stderr = tests.StringIOWrapper()
1585
1586
        ui.ui_factory = tests.TestUIFactory(stdin=entered_password + '\n',
1586
 
                                            stdout=stdout)
 
1587
                                            stdout=stdout,
 
1588
                                            stderr=stderr)
1587
1589
 
1588
1590
        # Since the password defined in the authentication config is ignored,
1589
1591
        # the user is prompted