← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1850
1850
class _DisconnectingTCPServer(object):
1851
1851
    """A TCP server that immediately closes any connection made to it."""
1852
1852
 
1853
 
    def setUp(self):
 
1853
    def start_server(self):
1854
1854
        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1855
1855
        self.sock.bind(('127.0.0.1', 0))
1856
1856
        self.sock.listen(1)
1868
1868
    def get_url(self):
1869
1869
        return 'bzr://127.0.0.1:%d/' % (self.port,)
1870
1870
 
1871
 
    def tearDown(self):
 
1871
    def stop_server(self):
1872
1872
        try:
1873
1873
            # make sure the thread dies by connecting to the listening socket,
1874
1874
            # just in case the test failed to do so.
1879
1879
            pass
1880
1880
        self.sock.close()
1881
1881
        self.thread.join()
1882