← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.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:
bzrlib/tests/test_http.py
247
247
            # The client may have already closed the socket.
248
248
            pass
249
249
 
250
 
    def tearDown(self):
 
250
    def stop_server(self):
251
251
        try:
252
252
            self._sock.close()
253
253
        except socket.error:
308
308
        try:
309
309
            self.assertRaises(httplib.UnknownProtocol, server.setUp)
310
310
        except:
311
 
            server.tearDown()
 
311
            server.stop_server()
312
312
            self.fail('HTTP Server creation did not raise UnknownProtocol')
313
313
 
314
314
    def test_force_invalid_protocol(self):
316
316
        try:
317
317
            self.assertRaises(httplib.UnknownProtocol, server.setUp)
318
318
        except:
319
 
            server.tearDown()
 
319
            server.stop_server()
320
320
            self.fail('HTTP Server creation did not raise UnknownProtocol')
321
321
 
322
322
    def test_server_start_and_stop(self):
325
325
        try:
326
326
            self.assertTrue(server._http_running)
327
327
        finally:
328
 
            server.tearDown()
 
328
            server.stop_server()
329
329
        self.assertFalse(server._http_running)
330
330
 
331
331
    def test_create_http_server_one_zero(self):
433
433
            url = server.get_url()
434
434
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
435
435
        finally:
436
 
            server.tearDown()
 
436
            server.stop_server()
437
437
 
438
438
 
439
439
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
763
763
        self.assertEqual(None, server.host)
764
764
        self.assertEqual(None, server.port)
765
765
 
766
 
    def test_setUp_and_tearDown(self):
 
766
    def test_setUp_and_stop(self):
767
767
        server = RecordingServer(expect_body_tail=None)
768
768
        server.setUp()
769
769
        try:
770
770
            self.assertNotEqual(None, server.host)
771
771
            self.assertNotEqual(None, server.port)
772
772
        finally:
773
 
            server.tearDown()
 
773
            server.stop_server()
774
774
        self.assertEqual(None, server.host)
775
775
        self.assertEqual(None, server.port)
776
776
 
1979
1979
 
1980
1980
    def tearDown(self):
1981
1981
        self._transport._report_activity = self.orig_report_activity
1982
 
        self.server.tearDown()
 
1982
        self.server.stop_server()
1983
1983
        tests.TestCase.tearDown(self)
1984
1984
 
1985
1985
    def get_transport(self):
2120
2120
 
2121
2121
    def tearDown(self):
2122
2122
        self._transport._report_activity = self.orig_report_activity
2123
 
        self.server.tearDown()
 
2123
        self.server.stop_server()
2124
2124
        tests.TestCase.tearDown(self)
2125
2125
 
2126
2126
 
2146
2146
 
2147
2147
    def tearDown(self):
2148
2148
        self._transport._report_activity = self.orig_report_activity
2149
 
        self.server.tearDown()
 
2149
        self.server.stop_server()
2150
2150
        tests.TestCase.tearDown(self)
2151
2151
 
2152
2152
    def assertActivitiesMatch(self):