/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_identitymap.py

  • Committer: Vincent Ladeuil
  • Date: 2007-11-25 14:42:29 UTC
  • mto: (3024.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3025.
  • Revision ID: v.ladeuil+lp@free.fr-20071125144229-kjnttz1wq4f1pls1
Fix bug #164567 by catching connection errors.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Fix doc string.

* bzrlib/transport/ftp.py:
Add missing imports.
(FtpTransport._create_connection): Catch socket.error to detect
connection errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_identitymap.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
"""Tests for the IdentityMap class."""
19
19
 
45
45
        map.add_weave("id", weave)
46
46
        self.assertRaises(errors.BzrError, map.add_weave, "id", weave)
47
47
        self.assertEqual(weave, map.find_weave("id"))
48
 
 
 
48
 
49
49
    def test_remove_object(self):
50
50
        map = identitymap.IdentityMap()
51
51
        weave = "foo"
53
53
        map.remove_object(weave)
54
54
        map.add_weave("id", weave)
55
55
 
56
 
 
 
56
 
57
57
class TestNullIdentityMap(TestCase):
58
58
 
59
59
    def test_symbols(self):
74
74
        map.add_weave("id", weave)
75
75
        map.add_weave("id", weave)
76
76
        self.assertEqual(None, map.find_weave("id"))
77
 
 
 
77
        
78
78
    def test_null_identity_map_has_no_remove(self):
79
79
        map = identitymap.NullIdentityMap()
80
80
        self.assertEqual(None, getattr(map, 'remove_object', None))