Rev 6553: (vila) Calling super() instead of mentioning the base class in setUp avoid in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Aug 9 09:20:38 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6553 [merge]
revision-id: pqm at pqm.ubuntu.com-20120809092037-lwa17t65fwlv7hus
parent: pqm at pqm.ubuntu.com-20120803100145-jt69roowxjfxv0mx
parent: v.ladeuil+lp at free.fr-20120804142747-2t498paljijf7q7y
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2012-08-09 09:20:37 +0000
message:
(vila) Calling super() instead of mentioning the base class in setUp avoid
mistakes. (Vincent Ladeuil)
modified:
bzrlib/plugins/launchpad/test_lp_api.py test_lp_api.py-20091217012733-8sgahbhjn35ilrbu-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/per_branch/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/per_interbranch/test_pull.py test_pull.py-20090227164435-0rtbqqyuh1rmm82n-1
bzrlib/tests/per_interbranch/test_push.py test_push.py-20090330192649-pca31sb2ubbtcs15-1
bzrlib/tests/per_merger.py per_merger.py-20091216002111-bzeo6wx2tcfpuj67-1
bzrlib/tests/per_tree/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/per_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/per_workingtree/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
bzrlib/tests/per_workingtree/test_views.py test_views.py-20080729134135-v4zjnb85eu9srl80-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_ignores.py test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
=== 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/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/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_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_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_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.py'
--- a/bzrlib/tests/test_http.py 2012-02-23 23:41:51 +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):
@@ -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)
=== 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_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-03-12 19:01:05 +0000
+++ b/bzrlib/tests/test_osutils.py 2012-08-04 14:27:47 +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'
@@ -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())
@@ -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)
@@ -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_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_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-02-23 23:26:35 +0000
+++ b/bzrlib/tests/test_selftest.py 2012-08-04 14:27:47 +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):
@@ -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,
@@ -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_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_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)
=== 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_wsgi.py'
--- a/bzrlib/tests/test_wsgi.py 2011-12-23 10:01:08 +0000
+++ b/bzrlib/tests/test_wsgi.py 2012-08-03 12:16:24 +0000
@@ -68,7 +68,7 @@
class TestWSGI(tests.TestCaseInTempDir, WSGITestMixin):
def setUp(self):
- tests.TestCase.setUp(self)
+ super(TestWSGI, self).setUp()
self.status = None
self.headers = None
=== 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