Rev 6554: Stop assuming that classes deriving from TestActivityMixin will also derive directly from tests.TestCase. in file:///home/vila/src/bzr/bugs/thou-shall-use-testcaseintempdir/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/thou-shall-use-testcaseintempdir/

------------------------------------------------------------
revno: 6554
revision-id: v.ladeuil+lp at free.fr-20120804100256-v1fw73uov2848ks3
parent: v.ladeuil+lp at free.fr-20120803121624-0y6afj3p4ectdv0v
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: thou-shall-use-testcaseintempdir
timestamp: Sat 2012-08-04 12:02:56 +0200
message:
  Stop assuming that classes deriving from TestActivityMixin will also derive directly from tests.TestCase.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2012-02-23 23:41:51 +0000
+++ b/bzrlib/tests/test_http.py	2012-08-04 10:02:56 +0000
@@ -2123,7 +2123,6 @@
     """
 
     def setUp(self):
-        tests.TestCase.setUp(self)
         self.server = self._activity_server(self._protocol_version)
         self.server.start_server()
         self.addCleanup(self.server.stop_server)
@@ -2266,6 +2265,7 @@
         )
 
     def setUp(self):
+        super(TestActivity, self).setUp()
         TestActivityMixin.setUp(self)
 
 
@@ -2280,6 +2280,7 @@
     _protocol_version = 'HTTP/1.1'
 
     def setUp(self):
+        super(TestNoReportActivity, self).setUp()
         self._transport =_urllib.HttpTransport_urllib
         TestActivityMixin.setUp(self)