← 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: Vincent Ladeuil
  • Date: 2012-08-04 10:02:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6553.
  • Revision ID: v.ladeuil+lp@free.fr-20120804100256-v1fw73uov2848ks3
Stop assuming that classes deriving from TestActivityMixin will also derive directly from tests.TestCase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
2123
2123
    """
2124
2124
 
2125
2125
    def setUp(self):
2126
 
        tests.TestCase.setUp(self)
2127
2126
        self.server = self._activity_server(self._protocol_version)
2128
2127
        self.server.start_server()
2129
2128
        self.addCleanup(self.server.stop_server)
2266
2265
        )
2267
2266
 
2268
2267
    def setUp(self):
 
2268
        super(TestActivity, self).setUp()
2269
2269
        TestActivityMixin.setUp(self)
2270
2270
 
2271
2271
 
2280
2280
    _protocol_version = 'HTTP/1.1'
2281
2281
 
2282
2282
    def setUp(self):
 
2283
        super(TestNoReportActivity, self).setUp()
2283
2284
        self._transport =_urllib.HttpTransport_urllib
2284
2285
        TestActivityMixin.setUp(self)
2285
2286