Rev 6556: Remaining tests matching setup(self) that can be rewritten with super(). in file:///home/vila/src/bzr/bugs/thou-shall-use-testcaseintempdir/

Vincent Ladeuil v.ladeuil+lp at free.fr
Sat Aug 4 14:27:48 UTC 2012


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

------------------------------------------------------------
revno: 6556
revision-id: v.ladeuil+lp at free.fr-20120804142747-2t498paljijf7q7y
parent: v.ladeuil+lp at free.fr-20120804111614-qvkz61424f4u1j0a
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: thou-shall-use-testcaseintempdir
timestamp: Sat 2012-08-04 16:27:47 +0200
message:
  Remaining tests matching setup(self) that can be rewritten with super().
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/test_lp_api.py'
--- a/bzrlib/plugins/launchpad/test_lp_api.py	2011-07-11 07:02:20 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_api.py	2012-08-04 14:27:47 +0000
@@ -34,7 +34,7 @@
     _test_needs_features = [launchpadlib_feature]
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestDependencyManagement, self).setUp()
         from bzrlib.plugins.launchpad import lp_api
         self.lp_api = lp_api
 

=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py	2011-12-21 16:26:24 +0000
+++ b/bzrlib/tests/blackbox/test_init.py	2012-08-04 14:27:47 +0000
@@ -36,7 +36,7 @@
 class TestInit(TestCaseWithTransport):
 
     def setUp(self):
-        TestCaseWithTransport.setUp(self)
+        super(TestInit, self).setUp()
         self._default_label = '2a'
 
     def test_init_with_format(self):

=== modified file 'bzrlib/tests/blackbox/test_inventory.py'
--- a/bzrlib/tests/blackbox/test_inventory.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_inventory.py	2012-08-04 14:27:47 +0000
@@ -24,7 +24,7 @@
 class TestInventory(TestCaseWithTransport):
 
     def setUp(self):
-        TestCaseWithTransport.setUp(self)
+        super(TestInventory, self).setUp()
 
         tree = self.make_branch_and_tree('.')
         self.build_tree(['a', 'b/', 'b/c'])

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py	2012-07-04 18:02:31 +0000
+++ b/bzrlib/tests/blackbox/test_push.py	2012-08-04 14:27:47 +0000
@@ -683,7 +683,7 @@
 class TestPushRedirect(tests.TestCaseWithTransport):
 
     def setUp(self):
-        tests.TestCaseWithTransport.setUp(self)
+        super(TestPushRedirect, self).setUp()
         self.memory_server = RedirectingMemoryServer()
         self.start_server(self.memory_server)
         # Make the branch and tree that we'll be pushing.

=== modified file 'bzrlib/tests/per_branch/test_hooks.py'
--- a/bzrlib/tests/per_branch/test_hooks.py	2012-03-14 13:34:43 +0000
+++ b/bzrlib/tests/per_branch/test_hooks.py	2012-08-04 14:27:47 +0000
@@ -294,7 +294,7 @@
     """
 
     def setUp(self):
-        ChangeBranchTipTestCase.setUp(self)
+        super(TestAllMethodsThatChangeTipWillRunHooks, self).setUp()
         self.installPreAndPostHooks()
 
     def installPreAndPostHooks(self):

=== modified file 'bzrlib/tests/per_interbranch/test_pull.py'
--- a/bzrlib/tests/per_interbranch/test_pull.py	2012-02-23 23:26:35 +0000
+++ b/bzrlib/tests/per_interbranch/test_pull.py	2012-08-04 14:27:47 +0000
@@ -125,7 +125,7 @@
 
     def setUp(self):
         self.hook_calls = []
-        TestCaseWithInterBranch.setUp(self)
+        super(TestPullHook, self).setUp()
 
     def capture_post_pull_hook(self, result):
         """Capture post pull hook calls to self.hook_calls.

=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
--- a/bzrlib/tests/per_interbranch/test_push.py	2012-03-14 10:17:12 +0000
+++ b/bzrlib/tests/per_interbranch/test_push.py	2012-08-04 14:27:47 +0000
@@ -294,7 +294,7 @@
 
     def setUp(self):
         self.hook_calls = []
-        TestCaseWithInterBranch.setUp(self)
+        super(TestPushHook, self).setUp()
 
     def capture_post_push_hook(self, result):
         """Capture post push hook calls to self.hook_calls.

=== modified file 'bzrlib/tests/per_merger.py'
--- a/bzrlib/tests/per_merger.py	2011-12-05 14:21:55 +0000
+++ b/bzrlib/tests/per_merger.py	2012-08-04 14:27:47 +0000
@@ -209,7 +209,7 @@
     """Tests that the 'merge_file_content' hook is invoked."""
 
     def setUp(self):
-        TestCaseWithTransport.setUp(self)
+        super(TestHookMergeFileContent, self).setUp()
         self.hook_log = []
 
     def install_hook_inactive(self):

=== modified file 'bzrlib/tests/per_tree/test_inv.py'
--- a/bzrlib/tests/per_tree/test_inv.py	2011-06-14 01:26:41 +0000
+++ b/bzrlib/tests/per_tree/test_inv.py	2012-08-04 14:27:47 +0000
@@ -42,7 +42,7 @@
     _test_needs_features = [features.SymlinkFeature]
 
     def setUp(self):
-        per_tree.TestCaseWithTree.setUp(self)
+        super(TestInventoryWithSymlinks, self).setUp()
         self.tree = self.get_tree_with_subdirs_and_all_content_types()
         self.tree.lock_read()
         self.addCleanup(self.tree.unlock)

=== modified file 'bzrlib/tests/per_versionedfile.py'
--- a/bzrlib/tests/per_versionedfile.py	2011-08-19 22:34:02 +0000
+++ b/bzrlib/tests/per_versionedfile.py	2012-08-04 14:27:47 +0000
@@ -841,7 +841,7 @@
 class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):
 
     def setUp(self):
-        TestCaseWithMemoryTransport.setUp(self)
+        super(TestPlanMergeVersionedFile, self).setUp()
         mapper = PrefixMapper()
         factory = make_file_factory(True, mapper)
         self.vf1 = factory(self.get_transport('root-1'))
@@ -2746,7 +2746,7 @@
         return ret
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(VirtualVersionedFilesTests, self).setUp()
         self._lines = {}
         self._parent_map = {}
         self.texts = VirtualVersionedFiles(self._get_parent_map,

=== modified file 'bzrlib/tests/per_workingtree/test_eol_conversion.py'
--- a/bzrlib/tests/per_workingtree/test_eol_conversion.py	2010-01-25 17:48:22 +0000
+++ b/bzrlib/tests/per_workingtree/test_eol_conversion.py	2012-08-04 14:27:47 +0000
@@ -51,7 +51,7 @@
         if not f():
             raise TestSkipped("format %s doesn't support content filtering"
                 % fmt)
-        TestCaseWithWorkingTree.setUp(self)
+        super(TestEolConversion, self).setUp()
 
     def patch_rules_searcher(self, eol):
         """Patch in a custom rules searcher with a given eol setting."""

=== modified file 'bzrlib/tests/per_workingtree/test_views.py'
--- a/bzrlib/tests/per_workingtree/test_views.py	2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_workingtree/test_views.py	2012-08-04 14:27:47 +0000
@@ -40,7 +40,7 @@
                 "supports views, assuming not" % fmt)
         if not f():
             raise TestSkipped("format %s doesn't support views" % fmt)
-        TestCaseWithWorkingTree.setUp(self)
+        super(TestTreeViews, self).setUp()
 
     def test_views_initially_empty(self):
         wt = self.make_branch_and_tree('wt')
@@ -172,7 +172,7 @@
             raise TestSkipped("Format %s declares that views are supported"
                               % fmt)
             # it's covered by TestTreeViews
-        TestCaseWithWorkingTree.setUp(self)
+        super(TestUnsupportedViews, self).setUp()
 
     def test_view_methods_raise(self):
         wt = self.make_branch_and_tree('wt')

=== modified file 'bzrlib/tests/test_btree_index.py'
--- a/bzrlib/tests/test_btree_index.py	2012-02-27 15:49:07 +0000
+++ b/bzrlib/tests/test_btree_index.py	2012-08-04 14:27:47 +0000
@@ -59,7 +59,7 @@
     # that they test.
 
     def setUp(self):
-        TestCaseWithTransport.setUp(self)
+        super(BTreeTestCase, self).setUp()
         self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)
 
     def make_nodes(self, count, key_elements, reference_lists):
@@ -1206,7 +1206,7 @@
     scenarios = btreeparser_scenarios()
 
     def setUp(self):
-        BTreeTestCase.setUp(self)
+        super(TestBTreeNodes, self).setUp()
         self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
 
     def test_LeafNode_1_0(self):

=== modified file 'bzrlib/tests/test_bugtracker.py'
--- a/bzrlib/tests/test_bugtracker.py	2010-09-25 20:08:01 +0000
+++ b/bzrlib/tests/test_bugtracker.py	2012-08-04 14:27:47 +0000
@@ -37,7 +37,7 @@
             return "http://bugs.com/%s" % bug_id
 
     def setUp(self):
-        TestCaseWithMemoryTransport.setUp(self)
+        super(TestGetBugURL, self).setUp()
         self.tracker_type = TestGetBugURL.TransientTracker
         self.tracker_type.log = []
         bugtracker.tracker_registry.register('transient', self.tracker_type)
@@ -185,7 +185,7 @@
     """Tests for URLParametrizedBugTracker."""
 
     def setUp(self):
-        TestCaseWithMemoryTransport.setUp(self)
+        super(TestURLParametrizedBugTracker, self).setUp()
         self.url = 'http://twistedmatrix.com/trac'
         self.tracker = bugtracker.URLParametrizedBugTracker('some', 'ticket/')
 
@@ -220,7 +220,7 @@
     """Tests for URLParametrizedIntegerBugTracker."""
 
     def setUp(self):
-        TestCaseWithMemoryTransport.setUp(self)
+        super(TestURLParametrizedIntegerBugTracker, self).setUp()
         self.url = 'http://twistedmatrix.com/trac'
         self.tracker = bugtracker.URLParametrizedIntegerBugTracker('some',
                                                                    'ticket/')

=== modified file 'bzrlib/tests/test_directory_service.py'
--- a/bzrlib/tests/test_directory_service.py	2012-03-21 13:29:11 +0000
+++ b/bzrlib/tests/test_directory_service.py	2012-08-04 14:27:47 +0000
@@ -42,7 +42,7 @@
 class TestDirectoryLookup(TestCase):
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestDirectoryLookup, self).setUp()
         self.registry = DirectoryServiceRegistry()
         self.registry.register('foo:', FooService, 'Map foo URLs to http urls')
 

=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py	2012-02-23 19:45:15 +0000
+++ b/bzrlib/tests/test_dirstate.py	2012-08-04 14:27:47 +0000
@@ -64,8 +64,7 @@
     _native_to_unicode = None # Not used yet
 
     def setUp(self):
-        tests.TestCaseWithTransport.setUp(self)
-
+        super(TestCaseWithDirState, self).setUp()
         self.overrideAttr(osutils,
                           '_selected_dir_reader', self._dir_reader_class())
 

=== modified file 'bzrlib/tests/test_generate_docs.py'
--- a/bzrlib/tests/test_generate_docs.py	2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/test_generate_docs.py	2012-08-04 14:27:47 +0000
@@ -34,7 +34,7 @@
 class TestGenerateDocs(TestCase):
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestGenerateDocs, self).setUp()
         self.sio = StringIO()
         self.options = Options()
         self.options.bzr_name = 'bzr'

=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2012-08-04 10:02:56 +0000
+++ b/bzrlib/tests/test_http.py	2012-08-04 14:27:47 +0000
@@ -487,7 +487,7 @@
         )
 
     def setUp(self):
-        http_utils.TestCaseWithWebserver.setUp(self)
+        super(TestHTTPConnections, self).setUp()
         self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
                         transport=self.get_transport())
 
@@ -1163,7 +1163,7 @@
                                       protocol_version=self._protocol_version)
 
     def setUp(self):
-        http_utils.TestCaseWithWebserver.setUp(self)
+        super(TestLimitedRangeRequestServer, self).setUp()
         # We need to manipulate ranges that correspond to real chunks in the
         # response, so we build a content appropriately.
         filler = ''.join(['abcdefghij' for x in range(102)])
@@ -1355,7 +1355,7 @@
         )
 
     def setUp(self):
-        http_utils.TestCaseWithWebserver.setUp(self)
+        super(TestRanges, self).setUp()
         self.build_tree_contents([('a', '0123456789')],)
 
     def create_transport_readonly_server(self):

=== modified file 'bzrlib/tests/test_ignores.py'
--- a/bzrlib/tests/test_ignores.py	2011-05-13 12:51:05 +0000
+++ b/bzrlib/tests/test_ignores.py	2012-08-04 14:27:47 +0000
@@ -149,7 +149,7 @@
 class TestRuntimeIgnores(TestCase):
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestRuntimeIgnores, self).setUp()
 
         # For the purposes of these tests, we must have no
         # runtime ignores

=== modified file 'bzrlib/tests/test_lazy_import.py'
--- a/bzrlib/tests/test_lazy_import.py	2012-01-05 09:50:04 +0000
+++ b/bzrlib/tests/test_lazy_import.py	2012-08-04 14:27:47 +0000
@@ -94,7 +94,7 @@
     """
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestScopeReplacer, self).setUp()
         # These tests assume we will not be proxying, so make sure proxying is
         # disabled.
         orig_proxy = lazy_import.ScopeReplacer._should_proxy
@@ -456,7 +456,7 @@
     """Test the ability to have a lazily imported module or object"""
 
     def setUp(self):
-        TestCaseInTempDir.setUp(self)
+        super(ImportReplacerHelper, self).setUp()
         self.create_modules()
         base_path = self.test_dir + '/base'
 

=== modified file 'bzrlib/tests/test_lockable_files.py'
--- a/bzrlib/tests/test_lockable_files.py	2011-08-19 22:34:02 +0000
+++ b/bzrlib/tests/test_lockable_files.py	2012-08-04 14:27:47 +0000
@@ -272,7 +272,7 @@
                                       _TestLockableFiles_mixin):
 
     def setUp(self):
-        TestCaseInTempDir.setUp(self)
+        super(TestLockableFiles_TransportLock, self).setUp()
         t = transport.get_transport_from_path('.')
         t.mkdir('.bzr')
         self.sub_transport = t.clone('.bzr')
@@ -293,11 +293,11 @@
 
 
 class TestLockableFiles_LockDir(TestCaseInTempDir,
-                              _TestLockableFiles_mixin):
+                                _TestLockableFiles_mixin):
     """LockableFile tests run with LockDir underneath"""
 
     def setUp(self):
-        TestCaseInTempDir.setUp(self)
+        super(TestLockableFiles_LockDir, self).setUp()
         self.transport = transport.get_transport_from_path('.')
         self.lockable = self.get_lockable()
         # the lock creation here sets mode - test_permissions on branch
@@ -329,11 +329,11 @@
 
 
 class TestLockableFiles_RemoteLockDir(TestCaseWithSmartMedium,
-                              _TestLockableFiles_mixin):
+                                      _TestLockableFiles_mixin):
     """LockableFile tests run with RemoteLockDir on a branch."""
 
     def setUp(self):
-        TestCaseWithSmartMedium.setUp(self)
+        super(TestLockableFiles_RemoteLockDir, self).setUp()
         # can only get a RemoteLockDir with some RemoteObject...
         # use a branch as thats what we want. These mixin tests test the end
         # to end behaviour, so stubbing out the backend and simulating would

=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2012-01-25 21:13:15 +0000
+++ b/bzrlib/tests/test_log.py	2012-08-04 14:27:47 +0000
@@ -1309,7 +1309,7 @@
 class TestLogWithBugs(TestCaseForLogFormatter, TestLogMixin):
 
     def setUp(self):
-        TestCaseForLogFormatter.setUp(self)
+        super(TestLogWithBugs, self).setUp()
         log.properties_handler_registry.register(
             'bugs_properties_handler',
             log._bugs_properties_handler)
@@ -1389,7 +1389,7 @@
 class TestLogForAuthors(TestCaseForLogFormatter):
 
     def setUp(self):
-        TestCaseForLogFormatter.setUp(self)
+        super(TestLogForAuthors, self).setUp()
         self.wt = self.make_standard_commit('nicky',
             authors=['John Doe <jdoe at example.com>',
                      'Jane Rey <jrey at example.com>'])

=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2012-01-28 12:47:17 +0000
+++ b/bzrlib/tests/test_merge.py	2012-08-04 14:27:47 +0000
@@ -559,7 +559,7 @@
 class TestPlanMerge(TestCaseWithMemoryTransport):
 
     def setUp(self):
-        TestCaseWithMemoryTransport.setUp(self)
+        super(TestPlanMerge, self).setUp()
         mapper = versionedfile.PrefixMapper()
         factory = knit.make_file_factory(True, mapper)
         self.vf = factory(self.get_transport())

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2012-08-04 11:16:14 +0000
+++ b/bzrlib/tests/test_osutils.py	2012-08-04 14:27:47 +0000
@@ -1771,7 +1771,7 @@
     _native_to_unicode = None
 
     def setUp(self):
-        tests.TestCaseInTempDir.setUp(self)
+        super(TestDirReader, self).setUp()
         self.overrideAttr(osutils,
                           '_selected_dir_reader', self._dir_reader_class())
 
@@ -2072,7 +2072,7 @@
     _test_needs_features = [features.chown_feature]
 
     def setUp(self):
-        tests.TestCaseInTempDir.setUp(self)
+        super(TestCreationOps, self).setUp()
         self.overrideAttr(os, 'chown', self._dummy_chown)
 
         # params set by call to _dummy_chown

=== modified file 'bzrlib/tests/test_osutils_encodings.py'
--- a/bzrlib/tests/test_osutils_encodings.py	2012-01-05 10:37:58 +0000
+++ b/bzrlib/tests/test_osutils_encodings.py	2012-08-04 14:27:47 +0000
@@ -72,7 +72,7 @@
     """Test the auto-detection of proper terminal encoding."""
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestTerminalEncoding, self).setUp()
         self.overrideAttr(sys, 'stdin')
         self.overrideAttr(sys, 'stdout')
         self.overrideAttr(sys, 'stderr')
@@ -167,7 +167,7 @@
     """Test detection of default user encoding."""
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestUserEncoding, self).setUp()
         self.overrideAttr(osutils, '_cached_user_encoding', None)
         self.overrideAttr(locale, 'getpreferredencoding', self.get_encoding)
         self.overrideAttr(locale, 'CODESET', None)

=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py	2012-03-14 11:49:29 +0000
+++ b/bzrlib/tests/test_remote.py	2012-08-04 14:27:47 +0000
@@ -3270,7 +3270,7 @@
     """
 
     def setUp(self):
-        TestRemoteRepository.setUp(self)
+        super(TestRepositoryInsertStream, self).setUp()
         self.disable_verb('Repository.insert_stream_1.19')
 
     def test_unlocked_repo(self):

=== modified file 'bzrlib/tests/test_revisionspec.py'
--- a/bzrlib/tests/test_revisionspec.py	2011-12-01 23:10:02 +0000
+++ b/bzrlib/tests/test_revisionspec.py	2012-08-04 14:27:47 +0000
@@ -700,7 +700,7 @@
 class TestRevisionSpec_annotate(TestRevisionSpec):
 
     def setUp(self):
-        TestRevisionSpec.setUp(self)
+        super(TestRevisionSpec_annotate, self).setUp()
         self.tree = self.make_branch_and_tree('annotate-tree')
         self.build_tree_contents([('annotate-tree/file1', '1\n')])
         self.tree.add('file1')

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2012-08-04 11:16:14 +0000
+++ b/bzrlib/tests/test_selftest.py	2012-08-04 14:27:47 +0000
@@ -2382,7 +2382,7 @@
     """Base class for tests testing how we might run bzr."""
 
     def setUp(self):
-        tests.TestCaseWithTransport.setUp(self)
+        super(TestWithFakedStartBzrSubprocess, self).setUp()
         self.subprocess_calls = []
 
     def start_bzr_subprocess(self, process_args, env_changes=None,

=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py	2012-02-23 23:26:35 +0000
+++ b/bzrlib/tests/test_sftp_transport.py	2012-08-04 14:27:47 +0000
@@ -147,8 +147,9 @@
 
 
 class SFTPNonServerTest(TestCase):
+
     def setUp(self):
-        TestCase.setUp(self)
+        super(SFTPNonServerTest, self).setUp()
         self.requireFeature(features.paramiko)
 
     def test_parse_url_with_home_dir(self):
@@ -361,7 +362,7 @@
 class TestSocketDelay(TestCase):
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestSocketDelay, self).setUp()
         self.requireFeature(features.paramiko)
 
     def test_delay(self):

=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py	2012-02-23 19:45:15 +0000
+++ b/bzrlib/tests/test_smart.py	2012-08-04 14:27:47 +0000
@@ -82,7 +82,7 @@
 
     def setUp(self):
         self.vfs_transport_factory = memory.MemoryServer
-        tests.TestCaseWithTransport.setUp(self)
+        super(TestCaseWithChrootedTransport, self).setUp()
         self._chroot_server = None
 
     def get_transport(self, relpath=None):
@@ -1058,7 +1058,7 @@
     """Base test case for verbs that implement set_last_revision."""
 
     def setUp(self):
-        tests.TestCaseWithMemoryTransport.setUp(self)
+        super(SetLastRevisionTestBase, self).setUp()
         backing_transport = self.get_transport()
         self.request = self.request_class(backing_transport)
         self.tree = self.make_branch_and_memory_tree('.')
@@ -1373,9 +1373,6 @@
 
 class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
 
-    def setUp(self):
-        tests.TestCaseWithMemoryTransport.setUp(self)
-
     def test_lock_write_on_unlocked_branch(self):
         backing = self.get_transport()
         request = smart_branch.SmartServerBranchRequestLockWrite(backing)
@@ -1481,9 +1478,6 @@
 
 class TestSmartServerBranchRequestGetPhysicalLockStatus(TestLockedBranch):
 
-    def setUp(self):
-        tests.TestCaseWithMemoryTransport.setUp(self)
-
     def test_true(self):
         backing = self.get_transport()
         request = smart_branch.SmartServerBranchRequestGetPhysicalLockStatus(
@@ -1509,9 +1503,6 @@
 
 class TestSmartServerBranchRequestUnlock(TestLockedBranch):
 
-    def setUp(self):
-        tests.TestCaseWithMemoryTransport.setUp(self)
-
     def test_unlock_on_locked_branch_and_repo(self):
         backing = self.get_transport()
         request = smart_branch.SmartServerBranchRequestUnlock(backing)
@@ -2201,9 +2192,6 @@
 
 class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
 
-    def setUp(self):
-        tests.TestCaseWithMemoryTransport.setUp(self)
-
     def test_unlock_on_locked_repo(self):
         backing = self.get_transport()
         request = smart_repo.SmartServerRepositoryUnlock(backing)

=== modified file 'bzrlib/tests/test_symbol_versioning.py'
--- a/bzrlib/tests/test_symbol_versioning.py	2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/test_symbol_versioning.py	2012-08-04 14:27:47 +0000
@@ -222,7 +222,7 @@
 class TestSuppressAndActivate(TestCase):
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestSuppressAndActivate, self).setUp()
         existing_filters = list(warnings.filters)
         def restore():
             warnings.filters[:] = existing_filters

=== modified file 'bzrlib/tests/test_xml.py'
--- a/bzrlib/tests/test_xml.py	2012-01-27 18:41:15 +0000
+++ b/bzrlib/tests/test_xml.py	2012-08-04 14:27:47 +0000
@@ -500,7 +500,7 @@
     """Whitebox testing of the _encode_and_escape function."""
 
     def setUp(self):
-        TestCase.setUp(self)
+        super(TestEncodeAndEscape, self).setUp()
         # Keep the cache clear before and after the test
         bzrlib.xml_serializer._clear_cache()
         self.addCleanup(bzrlib.xml_serializer._clear_cache)



More information about the bazaar-commits mailing list