~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Martin Pool
  • Date: 2010-01-06 04:48:59 UTC
  • mto: This revision was merged to the branch mainline in revision 4943.
  • Revision ID: mbp@sourcefrog.net-20100106044859-s8gwd12nev9p7nws
Rename Server.tearDown to .stop_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
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