/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: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

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'