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

  • Committer: Andrew Bennetts
  • Date: 2008-10-27 06:14:45 UTC
  • mfrom: (3793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3795.
  • Revision ID: andrew.bennetts@canonical.com-20081027061445-eqt9lz6uw1mbvq4g
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
29
29
    revision as _mod_revision,
30
30
    treebuilder,
31
31
    )
32
 
from bzrlib.bzrdir import BzrDir
33
32
from bzrlib.bundle import read_mergeable_from_url
34
33
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
35
34
from bzrlib.bundle.bundle_data import BundleTree
 
35
from bzrlib.bzrdir import BzrDir
36
36
from bzrlib.directory_service import directories
37
37
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
38
38
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
1598
1598
        sock_server = _DisconnectingTCPServer()
1599
1599
        sock_server.setUp()
1600
1600
        self.addCleanup(sock_server.tearDown)
 
1601
        # We don't really care what the url is since the server will close the
 
1602
        # connection without interpreting it
1601
1603
        url = sock_server.get_url()
1602
1604
        self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1603
1605