Rev 6555: Use super() instead of calling <base>.setup(self), as the original fix illustrated a too-easy-to-fall-into trap. 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: 6555
revision-id: v.ladeuil+lp at free.fr-20120804111614-qvkz61424f4u1j0a
parent: v.ladeuil+lp at free.fr-20120804100256-v1fw73uov2848ks3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: thou-shall-use-testcaseintempdir
timestamp: Sat 2012-08-04 13:16:14 +0200
message:
  Use super() instead of calling <base>.setup(self), as the original fix illustrated a too-easy-to-fall-into trap.
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- a/bzrlib/plugins/launchpad/test_lp_directory.py	2012-01-20 13:07:10 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_directory.py	2012-08-04 11:16:14 +0000
@@ -451,7 +451,7 @@
     server_class = None
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestXMLRPCTransport, self).setUp()
         self.server = self.server_class()
         self.server.start_server()
         self.addCleanup(self.server.stop_server)

=== modified file 'bzrlib/tests/test_commands.py'
--- a/bzrlib/tests/test_commands.py	2012-01-02 14:41:49 +0000
+++ b/bzrlib/tests/test_commands.py	2012-08-04 11:16:14 +0000
@@ -194,7 +194,7 @@
 class TestRegisterLazy(tests.TestCase):
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestRegisterLazy, self).setUp()
         import bzrlib.tests.fake_command
         del sys.modules['bzrlib.tests.fake_command']
         global lazy_command_imported

=== modified file 'bzrlib/tests/test_help.py'
--- a/bzrlib/tests/test_help.py	2011-09-27 13:18:53 +0000
+++ b/bzrlib/tests/test_help.py	2012-08-04 11:16:14 +0000
@@ -499,7 +499,7 @@
 class TestHelp(tests.TestCase):
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestHelp, self).setUp()
         commands.install_bzr_command_hooks()
 
 

=== modified file 'bzrlib/tests/test_http_response.py'
--- a/bzrlib/tests/test_http_response.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/test_http_response.py	2012-08-04 11:16:14 +0000
@@ -800,7 +800,7 @@
     """
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestRangeFileSizeReadLimited, self).setUp()
         # create a test datablock larger than _max_read_size.
         chunk_size = response.RangeFile._max_read_size
         test_pattern = '0123456789ABCDEF'

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2012-03-12 19:01:05 +0000
+++ b/bzrlib/tests/test_osutils.py	2012-08-04 11:16:14 +0000
@@ -554,7 +554,7 @@
     """Test pumpfile method."""
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestPumpFile, self).setUp()
         # create a test datablock
         self.block_size = 512
         pattern = '0123456789ABCDEF'
@@ -1985,7 +1985,7 @@
 class TestTerminalWidth(tests.TestCase):
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestTerminalWidth, self).setUp()
         self._orig_terminal_size_state = osutils._terminal_size_state
         self._orig_first_terminal_size = osutils._first_terminal_size
         self.addCleanup(self.restore_osutils_globals)

=== modified file 'bzrlib/tests/test_pack.py'
--- a/bzrlib/tests/test_pack.py	2011-11-29 09:13:54 +0000
+++ b/bzrlib/tests/test_pack.py	2012-08-04 11:16:14 +0000
@@ -73,7 +73,7 @@
 class TestContainerWriter(tests.TestCase):
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestContainerWriter, self).setUp()
         self.output = StringIO()
         self.writer = pack.ContainerWriter(self.output.write)
 

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2012-02-23 23:26:35 +0000
+++ b/bzrlib/tests/test_selftest.py	2012-08-04 11:16:14 +0000
@@ -1131,7 +1131,7 @@
         class SkippedTest(tests.TestCase):
 
             def setUp(self):
-                tests.TestCase.setUp(self)
+                super(SkippedTest, self).setUp()
                 calls.append('setUp')
                 self.addCleanup(self.cleanup)
 
@@ -1630,7 +1630,7 @@
         class Test(tests.TestCase):
 
             def setUp(self):
-                tests.TestCase.setUp(self)
+                super(Test, self).setUp()
                 self.orig = self.overrideAttr(obj, 'test_attr')
 
             def test_value(self):
@@ -1649,7 +1649,7 @@
         class Test(tests.TestCase):
 
             def setUp(self):
-                tests.TestCase.setUp(self)
+                super(Test, self).setUp()
                 self.orig = self.overrideAttr(obj, 'test_attr', new='modified')
 
             def test_value(self):
@@ -2602,7 +2602,7 @@
 class TestSelftestFiltering(tests.TestCase):
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestSelftestFiltering, self).setUp()
         self.suite = TestUtil.TestSuite()
         self.loader = TestUtil.TestLoader()
         self.suite.addTest(self.loader.loadTestsFromModule(

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2012-02-23 23:41:51 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2012-08-04 11:16:14 +0000
@@ -3388,7 +3388,7 @@
     """
 
     def setUp(self):
-        tests.TestCase.setUp(self)
+        super(TestResponseEncoderBufferingProtocolThree, self).setUp()
         self.writes = []
         self.responder = protocol.ProtocolThreeResponder(self.writes.append)