Bazaar

Merge lp:~vila/bzr/thou-shall-use-testcaseintempdir into lp:bzr

  1. thou-shall-use-testcaseintempdir
  2. Merge into bzr.dev
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merged at revision: 6553
Proposed branch: lp:~vila/bzr/thou-shall-use-testcaseintempdir
Merge into: lp:bzr
Diff against target: 772 lines (+65/-76)
39 files modified
bzrlib/plugins/launchpad/test_lp_api.py (+1/-1)
bzrlib/plugins/launchpad/test_lp_directory.py (+1/-1)
bzrlib/tests/blackbox/test_init.py (+1/-1)
bzrlib/tests/blackbox/test_inventory.py (+1/-1)
bzrlib/tests/blackbox/test_push.py (+1/-1)
bzrlib/tests/per_branch/test_hooks.py (+1/-1)
bzrlib/tests/per_interbranch/test_pull.py (+1/-1)
bzrlib/tests/per_interbranch/test_push.py (+1/-1)
bzrlib/tests/per_merger.py (+1/-1)
bzrlib/tests/per_tree/test_inv.py (+1/-1)
bzrlib/tests/per_versionedfile.py (+2/-2)
bzrlib/tests/per_workingtree/test_eol_conversion.py (+1/-1)
bzrlib/tests/per_workingtree/test_views.py (+2/-2)
bzrlib/tests/test_btree_index.py (+2/-2)
bzrlib/tests/test_bugtracker.py (+3/-3)
bzrlib/tests/test_commands.py (+1/-1)
bzrlib/tests/test_directory_service.py (+1/-1)
bzrlib/tests/test_dirstate.py (+1/-2)
bzrlib/tests/test_generate_docs.py (+1/-1)
bzrlib/tests/test_help.py (+1/-1)
bzrlib/tests/test_http.py (+5/-4)
bzrlib/tests/test_http_response.py (+1/-1)
bzrlib/tests/test_ignores.py (+1/-1)
bzrlib/tests/test_lazy_import.py (+2/-2)
bzrlib/tests/test_lockable_files.py (+5/-5)
bzrlib/tests/test_log.py (+2/-2)
bzrlib/tests/test_merge.py (+1/-1)
bzrlib/tests/test_osutils.py (+4/-4)
bzrlib/tests/test_osutils_encodings.py (+2/-2)
bzrlib/tests/test_pack.py (+1/-1)
bzrlib/tests/test_remote.py (+1/-1)
bzrlib/tests/test_revisionspec.py (+1/-1)
bzrlib/tests/test_selftest.py (+5/-5)
bzrlib/tests/test_sftp_transport.py (+3/-2)
bzrlib/tests/test_smart.py (+2/-14)
bzrlib/tests/test_smart_transport.py (+1/-1)
bzrlib/tests/test_symbol_versioning.py (+1/-1)
bzrlib/tests/test_wsgi.py (+1/-1)
bzrlib/tests/test_xml.py (+1/-1)
To merge this branch: bzr merge lp:~vila/bzr/thou-shall-use-testcaseintempdir
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+118074@code.launchpad.net

Commit message

Calling super() instead of mentioning the base class in setUp avoid mistakes.

Description of the change

Remember the annoying:

failed to open trace file: [Errno 13] Permission denied: '/you-should-use-TestCaseInTempDir-if-you-need-a-log-file'

while running the test suite ?

I'm been wondering for quite some time where it was coming from with a gut
feeling that some test weren't using the right base class (as hinted by the
error message).

Guess what ? I was wrong, the culprit was:

class TestWSGI(tests.TestCaseInTempDir, WSGITestMixin):

Huh ? It uses TestCaseInTempDir what the ... ?

    def setUp(self):
        tests.TestCase.setUp(self)

Oooops.

Better use super() here, far safer.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Ho ho ho, should grep to see if there are more of these.

review: Approve
Revision history for this message
Martin Packman (gz) wrote :

Nothing else broken, though bt.test_http.TestActivityMixin isn't the most robust thing ever.

Revision history for this message
Vincent Ladeuil (vila) wrote :

> Nothing else broken, though bt.test_http.TestActivityMixin isn't the most
> robust thing ever.

Urgh, indeed, youth sin I guess, fixed in the next revision.

Revision history for this message
Vincent Ladeuil (vila) wrote :

And this last revision get rid of the remaining tests where grep matched setup(self). There are only a few remaining matches that can may be be deleted but require more attention.

Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/plugins/launchpad/test_lp_api.py'
--- bzrlib/plugins/launchpad/test_lp_api.py 2011-07-11 07:02:20 +0000
+++ bzrlib/plugins/launchpad/test_lp_api.py 2012-08-04 14:30:26 +0000
@@ -34,7 +34,7 @@
34 _test_needs_features = [launchpadlib_feature]34 _test_needs_features = [launchpadlib_feature]
3535
36 def setUp(self):36 def setUp(self):
37 TestCase.setUp(self)37 super(TestDependencyManagement, self).setUp()
38 from bzrlib.plugins.launchpad import lp_api38 from bzrlib.plugins.launchpad import lp_api
39 self.lp_api = lp_api39 self.lp_api = lp_api
4040
4141
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- bzrlib/plugins/launchpad/test_lp_directory.py 2012-01-20 13:07:10 +0000
+++ bzrlib/plugins/launchpad/test_lp_directory.py 2012-08-04 14:30:26 +0000
@@ -451,7 +451,7 @@
451 server_class = None451 server_class = None
452452
453 def setUp(self):453 def setUp(self):
454 tests.TestCase.setUp(self)454 super(TestXMLRPCTransport, self).setUp()
455 self.server = self.server_class()455 self.server = self.server_class()
456 self.server.start_server()456 self.server.start_server()
457 self.addCleanup(self.server.stop_server)457 self.addCleanup(self.server.stop_server)
458458
=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- bzrlib/tests/blackbox/test_init.py 2011-12-21 16:26:24 +0000
+++ bzrlib/tests/blackbox/test_init.py 2012-08-04 14:30:26 +0000
@@ -36,7 +36,7 @@
36class TestInit(TestCaseWithTransport):36class TestInit(TestCaseWithTransport):
3737
38 def setUp(self):38 def setUp(self):
39 TestCaseWithTransport.setUp(self)39 super(TestInit, self).setUp()
40 self._default_label = '2a'40 self._default_label = '2a'
4141
42 def test_init_with_format(self):42 def test_init_with_format(self):
4343
=== modified file 'bzrlib/tests/blackbox/test_inventory.py'
--- bzrlib/tests/blackbox/test_inventory.py 2009-03-23 14:59:43 +0000
+++ bzrlib/tests/blackbox/test_inventory.py 2012-08-04 14:30:26 +0000
@@ -24,7 +24,7 @@
24class TestInventory(TestCaseWithTransport):24class TestInventory(TestCaseWithTransport):
2525
26 def setUp(self):26 def setUp(self):
27 TestCaseWithTransport.setUp(self)27 super(TestInventory, self).setUp()
2828
29 tree = self.make_branch_and_tree('.')29 tree = self.make_branch_and_tree('.')
30 self.build_tree(['a', 'b/', 'b/c'])30 self.build_tree(['a', 'b/', 'b/c'])
3131
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py 2012-07-04 18:02:31 +0000
+++ bzrlib/tests/blackbox/test_push.py 2012-08-04 14:30:26 +0000
@@ -683,7 +683,7 @@
683class TestPushRedirect(tests.TestCaseWithTransport):683class TestPushRedirect(tests.TestCaseWithTransport):
684684
685 def setUp(self):685 def setUp(self):
686 tests.TestCaseWithTransport.setUp(self)686 super(TestPushRedirect, self).setUp()
687 self.memory_server = RedirectingMemoryServer()687 self.memory_server = RedirectingMemoryServer()
688 self.start_server(self.memory_server)688 self.start_server(self.memory_server)
689 # Make the branch and tree that we'll be pushing.689 # Make the branch and tree that we'll be pushing.
690690
=== modified file 'bzrlib/tests/per_branch/test_hooks.py'
--- bzrlib/tests/per_branch/test_hooks.py 2012-03-14 13:34:43 +0000
+++ bzrlib/tests/per_branch/test_hooks.py 2012-08-04 14:30:26 +0000
@@ -294,7 +294,7 @@
294 """294 """
295295
296 def setUp(self):296 def setUp(self):
297 ChangeBranchTipTestCase.setUp(self)297 super(TestAllMethodsThatChangeTipWillRunHooks, self).setUp()
298 self.installPreAndPostHooks()298 self.installPreAndPostHooks()
299299
300 def installPreAndPostHooks(self):300 def installPreAndPostHooks(self):
301301
=== modified file 'bzrlib/tests/per_interbranch/test_pull.py'
--- bzrlib/tests/per_interbranch/test_pull.py 2012-02-23 23:26:35 +0000
+++ bzrlib/tests/per_interbranch/test_pull.py 2012-08-04 14:30:26 +0000
@@ -125,7 +125,7 @@
125125
126 def setUp(self):126 def setUp(self):
127 self.hook_calls = []127 self.hook_calls = []
128 TestCaseWithInterBranch.setUp(self)128 super(TestPullHook, self).setUp()
129129
130 def capture_post_pull_hook(self, result):130 def capture_post_pull_hook(self, result):
131 """Capture post pull hook calls to self.hook_calls.131 """Capture post pull hook calls to self.hook_calls.
132132
=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
--- bzrlib/tests/per_interbranch/test_push.py 2012-03-14 10:17:12 +0000
+++ bzrlib/tests/per_interbranch/test_push.py 2012-08-04 14:30:26 +0000
@@ -294,7 +294,7 @@
294294
295 def setUp(self):295 def setUp(self):
296 self.hook_calls = []296 self.hook_calls = []
297 TestCaseWithInterBranch.setUp(self)297 super(TestPushHook, self).setUp()
298298
299 def capture_post_push_hook(self, result):299 def capture_post_push_hook(self, result):
300 """Capture post push hook calls to self.hook_calls.300 """Capture post push hook calls to self.hook_calls.
301301
=== modified file 'bzrlib/tests/per_merger.py'
--- bzrlib/tests/per_merger.py 2011-12-05 14:21:55 +0000
+++ bzrlib/tests/per_merger.py 2012-08-04 14:30:26 +0000
@@ -209,7 +209,7 @@
209 """Tests that the 'merge_file_content' hook is invoked."""209 """Tests that the 'merge_file_content' hook is invoked."""
210210
211 def setUp(self):211 def setUp(self):
212 TestCaseWithTransport.setUp(self)212 super(TestHookMergeFileContent, self).setUp()
213 self.hook_log = []213 self.hook_log = []
214214
215 def install_hook_inactive(self):215 def install_hook_inactive(self):
216216
=== modified file 'bzrlib/tests/per_tree/test_inv.py'
--- bzrlib/tests/per_tree/test_inv.py 2011-06-14 01:26:41 +0000
+++ bzrlib/tests/per_tree/test_inv.py 2012-08-04 14:30:26 +0000
@@ -42,7 +42,7 @@
42 _test_needs_features = [features.SymlinkFeature]42 _test_needs_features = [features.SymlinkFeature]
4343
44 def setUp(self):44 def setUp(self):
45 per_tree.TestCaseWithTree.setUp(self)45 super(TestInventoryWithSymlinks, self).setUp()
46 self.tree = self.get_tree_with_subdirs_and_all_content_types()46 self.tree = self.get_tree_with_subdirs_and_all_content_types()
47 self.tree.lock_read()47 self.tree.lock_read()
48 self.addCleanup(self.tree.unlock)48 self.addCleanup(self.tree.unlock)
4949
=== modified file 'bzrlib/tests/per_versionedfile.py'
--- bzrlib/tests/per_versionedfile.py 2011-08-19 22:34:02 +0000
+++ bzrlib/tests/per_versionedfile.py 2012-08-04 14:30:26 +0000
@@ -841,7 +841,7 @@
841class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):841class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):
842842
843 def setUp(self):843 def setUp(self):
844 TestCaseWithMemoryTransport.setUp(self)844 super(TestPlanMergeVersionedFile, self).setUp()
845 mapper = PrefixMapper()845 mapper = PrefixMapper()
846 factory = make_file_factory(True, mapper)846 factory = make_file_factory(True, mapper)
847 self.vf1 = factory(self.get_transport('root-1'))847 self.vf1 = factory(self.get_transport('root-1'))
@@ -2746,7 +2746,7 @@
2746 return ret2746 return ret
27472747
2748 def setUp(self):2748 def setUp(self):
2749 TestCase.setUp(self)2749 super(VirtualVersionedFilesTests, self).setUp()
2750 self._lines = {}2750 self._lines = {}
2751 self._parent_map = {}2751 self._parent_map = {}
2752 self.texts = VirtualVersionedFiles(self._get_parent_map,2752 self.texts = VirtualVersionedFiles(self._get_parent_map,
27532753
=== modified file 'bzrlib/tests/per_workingtree/test_eol_conversion.py'
--- bzrlib/tests/per_workingtree/test_eol_conversion.py 2010-01-25 17:48:22 +0000
+++ bzrlib/tests/per_workingtree/test_eol_conversion.py 2012-08-04 14:30:26 +0000
@@ -51,7 +51,7 @@
51 if not f():51 if not f():
52 raise TestSkipped("format %s doesn't support content filtering"52 raise TestSkipped("format %s doesn't support content filtering"
53 % fmt)53 % fmt)
54 TestCaseWithWorkingTree.setUp(self)54 super(TestEolConversion, self).setUp()
5555
56 def patch_rules_searcher(self, eol):56 def patch_rules_searcher(self, eol):
57 """Patch in a custom rules searcher with a given eol setting."""57 """Patch in a custom rules searcher with a given eol setting."""
5858
=== modified file 'bzrlib/tests/per_workingtree/test_views.py'
--- bzrlib/tests/per_workingtree/test_views.py 2009-07-10 07:14:02 +0000
+++ bzrlib/tests/per_workingtree/test_views.py 2012-08-04 14:30:26 +0000
@@ -40,7 +40,7 @@
40 "supports views, assuming not" % fmt)40 "supports views, assuming not" % fmt)
41 if not f():41 if not f():
42 raise TestSkipped("format %s doesn't support views" % fmt)42 raise TestSkipped("format %s doesn't support views" % fmt)
43 TestCaseWithWorkingTree.setUp(self)43 super(TestTreeViews, self).setUp()
4444
45 def test_views_initially_empty(self):45 def test_views_initially_empty(self):
46 wt = self.make_branch_and_tree('wt')46 wt = self.make_branch_and_tree('wt')
@@ -172,7 +172,7 @@
172 raise TestSkipped("Format %s declares that views are supported"172 raise TestSkipped("Format %s declares that views are supported"
173 % fmt)173 % fmt)
174 # it's covered by TestTreeViews174 # it's covered by TestTreeViews
175 TestCaseWithWorkingTree.setUp(self)175 super(TestUnsupportedViews, self).setUp()
176176
177 def test_view_methods_raise(self):177 def test_view_methods_raise(self):
178 wt = self.make_branch_and_tree('wt')178 wt = self.make_branch_and_tree('wt')
179179
=== modified file 'bzrlib/tests/test_btree_index.py'
--- bzrlib/tests/test_btree_index.py 2012-02-27 15:49:07 +0000
+++ bzrlib/tests/test_btree_index.py 2012-08-04 14:30:26 +0000
@@ -59,7 +59,7 @@
59 # that they test.59 # that they test.
6060
61 def setUp(self):61 def setUp(self):
62 TestCaseWithTransport.setUp(self)62 super(BTreeTestCase, self).setUp()
63 self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)63 self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)
6464
65 def make_nodes(self, count, key_elements, reference_lists):65 def make_nodes(self, count, key_elements, reference_lists):
@@ -1206,7 +1206,7 @@
1206 scenarios = btreeparser_scenarios()1206 scenarios = btreeparser_scenarios()
12071207
1208 def setUp(self):1208 def setUp(self):
1209 BTreeTestCase.setUp(self)1209 super(TestBTreeNodes, self).setUp()
1210 self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)1210 self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
12111211
1212 def test_LeafNode_1_0(self):1212 def test_LeafNode_1_0(self):
12131213
=== modified file 'bzrlib/tests/test_bugtracker.py'
--- bzrlib/tests/test_bugtracker.py 2010-09-25 20:08:01 +0000
+++ bzrlib/tests/test_bugtracker.py 2012-08-04 14:30:26 +0000
@@ -37,7 +37,7 @@
37 return "http://bugs.com/%s" % bug_id37 return "http://bugs.com/%s" % bug_id
3838
39 def setUp(self):39 def setUp(self):
40 TestCaseWithMemoryTransport.setUp(self)40 super(TestGetBugURL, self).setUp()
41 self.tracker_type = TestGetBugURL.TransientTracker41 self.tracker_type = TestGetBugURL.TransientTracker
42 self.tracker_type.log = []42 self.tracker_type.log = []
43 bugtracker.tracker_registry.register('transient', self.tracker_type)43 bugtracker.tracker_registry.register('transient', self.tracker_type)
@@ -185,7 +185,7 @@
185 """Tests for URLParametrizedBugTracker."""185 """Tests for URLParametrizedBugTracker."""
186186
187 def setUp(self):187 def setUp(self):
188 TestCaseWithMemoryTransport.setUp(self)188 super(TestURLParametrizedBugTracker, self).setUp()
189 self.url = 'http://twistedmatrix.com/trac'189 self.url = 'http://twistedmatrix.com/trac'
190 self.tracker = bugtracker.URLParametrizedBugTracker('some', 'ticket/')190 self.tracker = bugtracker.URLParametrizedBugTracker('some', 'ticket/')
191191
@@ -220,7 +220,7 @@
220 """Tests for URLParametrizedIntegerBugTracker."""220 """Tests for URLParametrizedIntegerBugTracker."""
221221
222 def setUp(self):222 def setUp(self):
223 TestCaseWithMemoryTransport.setUp(self)223 super(TestURLParametrizedIntegerBugTracker, self).setUp()
224 self.url = 'http://twistedmatrix.com/trac'224 self.url = 'http://twistedmatrix.com/trac'
225 self.tracker = bugtracker.URLParametrizedIntegerBugTracker('some',225 self.tracker = bugtracker.URLParametrizedIntegerBugTracker('some',
226 'ticket/')226 'ticket/')
227227
=== modified file 'bzrlib/tests/test_commands.py'
--- bzrlib/tests/test_commands.py 2012-01-02 14:41:49 +0000
+++ bzrlib/tests/test_commands.py 2012-08-04 14:30:26 +0000
@@ -194,7 +194,7 @@
194class TestRegisterLazy(tests.TestCase):194class TestRegisterLazy(tests.TestCase):
195195
196 def setUp(self):196 def setUp(self):
197 tests.TestCase.setUp(self)197 super(TestRegisterLazy, self).setUp()
198 import bzrlib.tests.fake_command198 import bzrlib.tests.fake_command
199 del sys.modules['bzrlib.tests.fake_command']199 del sys.modules['bzrlib.tests.fake_command']
200 global lazy_command_imported200 global lazy_command_imported
201201
=== modified file 'bzrlib/tests/test_directory_service.py'
--- bzrlib/tests/test_directory_service.py 2012-03-21 13:29:11 +0000
+++ bzrlib/tests/test_directory_service.py 2012-08-04 14:30:26 +0000
@@ -42,7 +42,7 @@
42class TestDirectoryLookup(TestCase):42class TestDirectoryLookup(TestCase):
4343
44 def setUp(self):44 def setUp(self):
45 TestCase.setUp(self)45 super(TestDirectoryLookup, self).setUp()
46 self.registry = DirectoryServiceRegistry()46 self.registry = DirectoryServiceRegistry()
47 self.registry.register('foo:', FooService, 'Map foo URLs to http urls')47 self.registry.register('foo:', FooService, 'Map foo URLs to http urls')
4848
4949
=== modified file 'bzrlib/tests/test_dirstate.py'
--- bzrlib/tests/test_dirstate.py 2012-02-23 19:45:15 +0000
+++ bzrlib/tests/test_dirstate.py 2012-08-04 14:30:26 +0000
@@ -64,8 +64,7 @@
64 _native_to_unicode = None # Not used yet64 _native_to_unicode = None # Not used yet
6565
66 def setUp(self):66 def setUp(self):
67 tests.TestCaseWithTransport.setUp(self)67 super(TestCaseWithDirState, self).setUp()
68
69 self.overrideAttr(osutils,68 self.overrideAttr(osutils,
70 '_selected_dir_reader', self._dir_reader_class())69 '_selected_dir_reader', self._dir_reader_class())
7170
7271
=== modified file 'bzrlib/tests/test_generate_docs.py'
--- bzrlib/tests/test_generate_docs.py 2011-01-12 01:01:53 +0000
+++ bzrlib/tests/test_generate_docs.py 2012-08-04 14:30:26 +0000
@@ -34,7 +34,7 @@
34class TestGenerateDocs(TestCase):34class TestGenerateDocs(TestCase):
3535
36 def setUp(self):36 def setUp(self):
37 TestCase.setUp(self)37 super(TestGenerateDocs, self).setUp()
38 self.sio = StringIO()38 self.sio = StringIO()
39 self.options = Options()39 self.options = Options()
40 self.options.bzr_name = 'bzr'40 self.options.bzr_name = 'bzr'
4141
=== modified file 'bzrlib/tests/test_help.py'
--- bzrlib/tests/test_help.py 2011-09-27 13:18:53 +0000
+++ bzrlib/tests/test_help.py 2012-08-04 14:30:26 +0000
@@ -499,7 +499,7 @@
499class TestHelp(tests.TestCase):499class TestHelp(tests.TestCase):
500500
501 def setUp(self):501 def setUp(self):
502 tests.TestCase.setUp(self)502 super(TestHelp, self).setUp()
503 commands.install_bzr_command_hooks()503 commands.install_bzr_command_hooks()
504504
505505
506506
=== modified file 'bzrlib/tests/test_http.py'
--- bzrlib/tests/test_http.py 2012-02-23 23:41:51 +0000
+++ bzrlib/tests/test_http.py 2012-08-04 14:30:26 +0000
@@ -487,7 +487,7 @@
487 )487 )
488488
489 def setUp(self):489 def setUp(self):
490 http_utils.TestCaseWithWebserver.setUp(self)490 super(TestHTTPConnections, self).setUp()
491 self.build_tree(['foo/', 'foo/bar'], line_endings='binary',491 self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
492 transport=self.get_transport())492 transport=self.get_transport())
493493
@@ -1163,7 +1163,7 @@
1163 protocol_version=self._protocol_version)1163 protocol_version=self._protocol_version)
11641164
1165 def setUp(self):1165 def setUp(self):
1166 http_utils.TestCaseWithWebserver.setUp(self)1166 super(TestLimitedRangeRequestServer, self).setUp()
1167 # We need to manipulate ranges that correspond to real chunks in the1167 # We need to manipulate ranges that correspond to real chunks in the
1168 # response, so we build a content appropriately.1168 # response, so we build a content appropriately.
1169 filler = ''.join(['abcdefghij' for x in range(102)])1169 filler = ''.join(['abcdefghij' for x in range(102)])
@@ -1355,7 +1355,7 @@
1355 )1355 )
13561356
1357 def setUp(self):1357 def setUp(self):
1358 http_utils.TestCaseWithWebserver.setUp(self)1358 super(TestRanges, self).setUp()
1359 self.build_tree_contents([('a', '0123456789')],)1359 self.build_tree_contents([('a', '0123456789')],)
13601360
1361 def create_transport_readonly_server(self):1361 def create_transport_readonly_server(self):
@@ -2123,7 +2123,6 @@
2123 """2123 """
21242124
2125 def setUp(self):2125 def setUp(self):
2126 tests.TestCase.setUp(self)
2127 self.server = self._activity_server(self._protocol_version)2126 self.server = self._activity_server(self._protocol_version)
2128 self.server.start_server()2127 self.server.start_server()
2129 self.addCleanup(self.server.stop_server)2128 self.addCleanup(self.server.stop_server)
@@ -2266,6 +2265,7 @@
2266 )2265 )
22672266
2268 def setUp(self):2267 def setUp(self):
2268 super(TestActivity, self).setUp()
2269 TestActivityMixin.setUp(self)2269 TestActivityMixin.setUp(self)
22702270
22712271
@@ -2280,6 +2280,7 @@
2280 _protocol_version = 'HTTP/1.1'2280 _protocol_version = 'HTTP/1.1'
22812281
2282 def setUp(self):2282 def setUp(self):
2283 super(TestNoReportActivity, self).setUp()
2283 self._transport =_urllib.HttpTransport_urllib2284 self._transport =_urllib.HttpTransport_urllib
2284 TestActivityMixin.setUp(self)2285 TestActivityMixin.setUp(self)
22852286
22862287
=== modified file 'bzrlib/tests/test_http_response.py'
--- bzrlib/tests/test_http_response.py 2010-02-17 17:11:16 +0000
+++ bzrlib/tests/test_http_response.py 2012-08-04 14:30:26 +0000
@@ -800,7 +800,7 @@
800 """800 """
801801
802 def setUp(self):802 def setUp(self):
803 tests.TestCase.setUp(self)803 super(TestRangeFileSizeReadLimited, self).setUp()
804 # create a test datablock larger than _max_read_size.804 # create a test datablock larger than _max_read_size.
805 chunk_size = response.RangeFile._max_read_size805 chunk_size = response.RangeFile._max_read_size
806 test_pattern = '0123456789ABCDEF'806 test_pattern = '0123456789ABCDEF'
807807
=== modified file 'bzrlib/tests/test_ignores.py'
--- bzrlib/tests/test_ignores.py 2011-05-13 12:51:05 +0000
+++ bzrlib/tests/test_ignores.py 2012-08-04 14:30:26 +0000
@@ -149,7 +149,7 @@
149class TestRuntimeIgnores(TestCase):149class TestRuntimeIgnores(TestCase):
150150
151 def setUp(self):151 def setUp(self):
152 TestCase.setUp(self)152 super(TestRuntimeIgnores, self).setUp()
153153
154 # For the purposes of these tests, we must have no154 # For the purposes of these tests, we must have no
155 # runtime ignores155 # runtime ignores
156156
=== modified file 'bzrlib/tests/test_lazy_import.py'
--- bzrlib/tests/test_lazy_import.py 2012-01-05 09:50:04 +0000
+++ bzrlib/tests/test_lazy_import.py 2012-08-04 14:30:26 +0000
@@ -94,7 +94,7 @@
94 """94 """
9595
96 def setUp(self):96 def setUp(self):
97 TestCase.setUp(self)97 super(TestScopeReplacer, self).setUp()
98 # These tests assume we will not be proxying, so make sure proxying is98 # These tests assume we will not be proxying, so make sure proxying is
99 # disabled.99 # disabled.
100 orig_proxy = lazy_import.ScopeReplacer._should_proxy100 orig_proxy = lazy_import.ScopeReplacer._should_proxy
@@ -456,7 +456,7 @@
456 """Test the ability to have a lazily imported module or object"""456 """Test the ability to have a lazily imported module or object"""
457457
458 def setUp(self):458 def setUp(self):
459 TestCaseInTempDir.setUp(self)459 super(ImportReplacerHelper, self).setUp()
460 self.create_modules()460 self.create_modules()
461 base_path = self.test_dir + '/base'461 base_path = self.test_dir + '/base'
462462
463463
=== modified file 'bzrlib/tests/test_lockable_files.py'
--- bzrlib/tests/test_lockable_files.py 2011-08-19 22:34:02 +0000
+++ bzrlib/tests/test_lockable_files.py 2012-08-04 14:30:26 +0000
@@ -272,7 +272,7 @@
272 _TestLockableFiles_mixin):272 _TestLockableFiles_mixin):
273273
274 def setUp(self):274 def setUp(self):
275 TestCaseInTempDir.setUp(self)275 super(TestLockableFiles_TransportLock, self).setUp()
276 t = transport.get_transport_from_path('.')276 t = transport.get_transport_from_path('.')
277 t.mkdir('.bzr')277 t.mkdir('.bzr')
278 self.sub_transport = t.clone('.bzr')278 self.sub_transport = t.clone('.bzr')
@@ -293,11 +293,11 @@
293293
294294
295class TestLockableFiles_LockDir(TestCaseInTempDir,295class TestLockableFiles_LockDir(TestCaseInTempDir,
296 _TestLockableFiles_mixin):296 _TestLockableFiles_mixin):
297 """LockableFile tests run with LockDir underneath"""297 """LockableFile tests run with LockDir underneath"""
298298
299 def setUp(self):299 def setUp(self):
300 TestCaseInTempDir.setUp(self)300 super(TestLockableFiles_LockDir, self).setUp()
301 self.transport = transport.get_transport_from_path('.')301 self.transport = transport.get_transport_from_path('.')
302 self.lockable = self.get_lockable()302 self.lockable = self.get_lockable()
303 # the lock creation here sets mode - test_permissions on branch303 # the lock creation here sets mode - test_permissions on branch
@@ -329,11 +329,11 @@
329329
330330
331class TestLockableFiles_RemoteLockDir(TestCaseWithSmartMedium,331class TestLockableFiles_RemoteLockDir(TestCaseWithSmartMedium,
332 _TestLockableFiles_mixin):332 _TestLockableFiles_mixin):
333 """LockableFile tests run with RemoteLockDir on a branch."""333 """LockableFile tests run with RemoteLockDir on a branch."""
334334
335 def setUp(self):335 def setUp(self):
336 TestCaseWithSmartMedium.setUp(self)336 super(TestLockableFiles_RemoteLockDir, self).setUp()
337 # can only get a RemoteLockDir with some RemoteObject...337 # can only get a RemoteLockDir with some RemoteObject...
338 # use a branch as thats what we want. These mixin tests test the end338 # use a branch as thats what we want. These mixin tests test the end
339 # to end behaviour, so stubbing out the backend and simulating would339 # to end behaviour, so stubbing out the backend and simulating would
340340
=== modified file 'bzrlib/tests/test_log.py'
--- bzrlib/tests/test_log.py 2012-01-25 21:13:15 +0000
+++ bzrlib/tests/test_log.py 2012-08-04 14:30:26 +0000
@@ -1309,7 +1309,7 @@
1309class TestLogWithBugs(TestCaseForLogFormatter, TestLogMixin):1309class TestLogWithBugs(TestCaseForLogFormatter, TestLogMixin):
13101310
1311 def setUp(self):1311 def setUp(self):
1312 TestCaseForLogFormatter.setUp(self)1312 super(TestLogWithBugs, self).setUp()
1313 log.properties_handler_registry.register(1313 log.properties_handler_registry.register(
1314 'bugs_properties_handler',1314 'bugs_properties_handler',
1315 log._bugs_properties_handler)1315 log._bugs_properties_handler)
@@ -1389,7 +1389,7 @@
1389class TestLogForAuthors(TestCaseForLogFormatter):1389class TestLogForAuthors(TestCaseForLogFormatter):
13901390
1391 def setUp(self):1391 def setUp(self):
1392 TestCaseForLogFormatter.setUp(self)1392 super(TestLogForAuthors, self).setUp()
1393 self.wt = self.make_standard_commit('nicky',1393 self.wt = self.make_standard_commit('nicky',
1394 authors=['John Doe <jdoe@example.com>',1394 authors=['John Doe <jdoe@example.com>',
1395 'Jane Rey <jrey@example.com>'])1395 'Jane Rey <jrey@example.com>'])
13961396
=== modified file 'bzrlib/tests/test_merge.py'
--- bzrlib/tests/test_merge.py 2012-01-28 12:47:17 +0000
+++ bzrlib/tests/test_merge.py 2012-08-04 14:30:26 +0000
@@ -559,7 +559,7 @@
559class TestPlanMerge(TestCaseWithMemoryTransport):559class TestPlanMerge(TestCaseWithMemoryTransport):
560560
561 def setUp(self):561 def setUp(self):
562 TestCaseWithMemoryTransport.setUp(self)562 super(TestPlanMerge, self).setUp()
563 mapper = versionedfile.PrefixMapper()563 mapper = versionedfile.PrefixMapper()
564 factory = knit.make_file_factory(True, mapper)564 factory = knit.make_file_factory(True, mapper)
565 self.vf = factory(self.get_transport())565 self.vf = factory(self.get_transport())
566566
=== modified file 'bzrlib/tests/test_osutils.py'
--- bzrlib/tests/test_osutils.py 2012-03-12 19:01:05 +0000
+++ bzrlib/tests/test_osutils.py 2012-08-04 14:30:26 +0000
@@ -554,7 +554,7 @@
554 """Test pumpfile method."""554 """Test pumpfile method."""
555555
556 def setUp(self):556 def setUp(self):
557 tests.TestCase.setUp(self)557 super(TestPumpFile, self).setUp()
558 # create a test datablock558 # create a test datablock
559 self.block_size = 512559 self.block_size = 512
560 pattern = '0123456789ABCDEF'560 pattern = '0123456789ABCDEF'
@@ -1771,7 +1771,7 @@
1771 _native_to_unicode = None1771 _native_to_unicode = None
17721772
1773 def setUp(self):1773 def setUp(self):
1774 tests.TestCaseInTempDir.setUp(self)1774 super(TestDirReader, self).setUp()
1775 self.overrideAttr(osutils,1775 self.overrideAttr(osutils,
1776 '_selected_dir_reader', self._dir_reader_class())1776 '_selected_dir_reader', self._dir_reader_class())
17771777
@@ -1985,7 +1985,7 @@
1985class TestTerminalWidth(tests.TestCase):1985class TestTerminalWidth(tests.TestCase):
19861986
1987 def setUp(self):1987 def setUp(self):
1988 tests.TestCase.setUp(self)1988 super(TestTerminalWidth, self).setUp()
1989 self._orig_terminal_size_state = osutils._terminal_size_state1989 self._orig_terminal_size_state = osutils._terminal_size_state
1990 self._orig_first_terminal_size = osutils._first_terminal_size1990 self._orig_first_terminal_size = osutils._first_terminal_size
1991 self.addCleanup(self.restore_osutils_globals)1991 self.addCleanup(self.restore_osutils_globals)
@@ -2072,7 +2072,7 @@
2072 _test_needs_features = [features.chown_feature]2072 _test_needs_features = [features.chown_feature]
20732073
2074 def setUp(self):2074 def setUp(self):
2075 tests.TestCaseInTempDir.setUp(self)2075 super(TestCreationOps, self).setUp()
2076 self.overrideAttr(os, 'chown', self._dummy_chown)2076 self.overrideAttr(os, 'chown', self._dummy_chown)
20772077
2078 # params set by call to _dummy_chown2078 # params set by call to _dummy_chown
20792079
=== modified file 'bzrlib/tests/test_osutils_encodings.py'
--- bzrlib/tests/test_osutils_encodings.py 2012-01-05 10:37:58 +0000
+++ bzrlib/tests/test_osutils_encodings.py 2012-08-04 14:30:26 +0000
@@ -72,7 +72,7 @@
72 """Test the auto-detection of proper terminal encoding."""72 """Test the auto-detection of proper terminal encoding."""
7373
74 def setUp(self):74 def setUp(self):
75 TestCase.setUp(self)75 super(TestTerminalEncoding, self).setUp()
76 self.overrideAttr(sys, 'stdin')76 self.overrideAttr(sys, 'stdin')
77 self.overrideAttr(sys, 'stdout')77 self.overrideAttr(sys, 'stdout')
78 self.overrideAttr(sys, 'stderr')78 self.overrideAttr(sys, 'stderr')
@@ -167,7 +167,7 @@
167 """Test detection of default user encoding."""167 """Test detection of default user encoding."""
168168
169 def setUp(self):169 def setUp(self):
170 TestCase.setUp(self)170 super(TestUserEncoding, self).setUp()
171 self.overrideAttr(osutils, '_cached_user_encoding', None)171 self.overrideAttr(osutils, '_cached_user_encoding', None)
172 self.overrideAttr(locale, 'getpreferredencoding', self.get_encoding)172 self.overrideAttr(locale, 'getpreferredencoding', self.get_encoding)
173 self.overrideAttr(locale, 'CODESET', None)173 self.overrideAttr(locale, 'CODESET', None)
174174
=== modified file 'bzrlib/tests/test_pack.py'
--- bzrlib/tests/test_pack.py 2011-11-29 09:13:54 +0000
+++ bzrlib/tests/test_pack.py 2012-08-04 14:30:26 +0000
@@ -73,7 +73,7 @@
73class TestContainerWriter(tests.TestCase):73class TestContainerWriter(tests.TestCase):
7474
75 def setUp(self):75 def setUp(self):
76 tests.TestCase.setUp(self)76 super(TestContainerWriter, self).setUp()
77 self.output = StringIO()77 self.output = StringIO()
78 self.writer = pack.ContainerWriter(self.output.write)78 self.writer = pack.ContainerWriter(self.output.write)
7979
8080
=== modified file 'bzrlib/tests/test_remote.py'
--- bzrlib/tests/test_remote.py 2012-03-14 11:49:29 +0000
+++ bzrlib/tests/test_remote.py 2012-08-04 14:30:26 +0000
@@ -3270,7 +3270,7 @@
3270 """3270 """
32713271
3272 def setUp(self):3272 def setUp(self):
3273 TestRemoteRepository.setUp(self)3273 super(TestRepositoryInsertStream, self).setUp()
3274 self.disable_verb('Repository.insert_stream_1.19')3274 self.disable_verb('Repository.insert_stream_1.19')
32753275
3276 def test_unlocked_repo(self):3276 def test_unlocked_repo(self):
32773277
=== modified file 'bzrlib/tests/test_revisionspec.py'
--- bzrlib/tests/test_revisionspec.py 2011-12-01 23:10:02 +0000
+++ bzrlib/tests/test_revisionspec.py 2012-08-04 14:30:26 +0000
@@ -700,7 +700,7 @@
700class TestRevisionSpec_annotate(TestRevisionSpec):700class TestRevisionSpec_annotate(TestRevisionSpec):
701701
702 def setUp(self):702 def setUp(self):
703 TestRevisionSpec.setUp(self)703 super(TestRevisionSpec_annotate, self).setUp()
704 self.tree = self.make_branch_and_tree('annotate-tree')704 self.tree = self.make_branch_and_tree('annotate-tree')
705 self.build_tree_contents([('annotate-tree/file1', '1\n')])705 self.build_tree_contents([('annotate-tree/file1', '1\n')])
706 self.tree.add('file1')706 self.tree.add('file1')
707707
=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py 2012-02-23 23:26:35 +0000
+++ bzrlib/tests/test_selftest.py 2012-08-04 14:30:26 +0000
@@ -1131,7 +1131,7 @@
1131 class SkippedTest(tests.TestCase):1131 class SkippedTest(tests.TestCase):
11321132
1133 def setUp(self):1133 def setUp(self):
1134 tests.TestCase.setUp(self)1134 super(SkippedTest, self).setUp()
1135 calls.append('setUp')1135 calls.append('setUp')
1136 self.addCleanup(self.cleanup)1136 self.addCleanup(self.cleanup)
11371137
@@ -1630,7 +1630,7 @@
1630 class Test(tests.TestCase):1630 class Test(tests.TestCase):
16311631
1632 def setUp(self):1632 def setUp(self):
1633 tests.TestCase.setUp(self)1633 super(Test, self).setUp()
1634 self.orig = self.overrideAttr(obj, 'test_attr')1634 self.orig = self.overrideAttr(obj, 'test_attr')
16351635
1636 def test_value(self):1636 def test_value(self):
@@ -1649,7 +1649,7 @@
1649 class Test(tests.TestCase):1649 class Test(tests.TestCase):
16501650
1651 def setUp(self):1651 def setUp(self):
1652 tests.TestCase.setUp(self)1652 super(Test, self).setUp()
1653 self.orig = self.overrideAttr(obj, 'test_attr', new='modified')1653 self.orig = self.overrideAttr(obj, 'test_attr', new='modified')
16541654
1655 def test_value(self):1655 def test_value(self):
@@ -2382,7 +2382,7 @@
2382 """Base class for tests testing how we might run bzr."""2382 """Base class for tests testing how we might run bzr."""
23832383
2384 def setUp(self):2384 def setUp(self):
2385 tests.TestCaseWithTransport.setUp(self)2385 super(TestWithFakedStartBzrSubprocess, self).setUp()
2386 self.subprocess_calls = []2386 self.subprocess_calls = []
23872387
2388 def start_bzr_subprocess(self, process_args, env_changes=None,2388 def start_bzr_subprocess(self, process_args, env_changes=None,
@@ -2602,7 +2602,7 @@
2602class TestSelftestFiltering(tests.TestCase):2602class TestSelftestFiltering(tests.TestCase):
26032603
2604 def setUp(self):2604 def setUp(self):
2605 tests.TestCase.setUp(self)2605 super(TestSelftestFiltering, self).setUp()
2606 self.suite = TestUtil.TestSuite()2606 self.suite = TestUtil.TestSuite()
2607 self.loader = TestUtil.TestLoader()2607 self.loader = TestUtil.TestLoader()
2608 self.suite.addTest(self.loader.loadTestsFromModule(2608 self.suite.addTest(self.loader.loadTestsFromModule(
26092609
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- bzrlib/tests/test_sftp_transport.py 2012-02-23 23:26:35 +0000
+++ bzrlib/tests/test_sftp_transport.py 2012-08-04 14:30:26 +0000
@@ -147,8 +147,9 @@
147147
148148
149class SFTPNonServerTest(TestCase):149class SFTPNonServerTest(TestCase):
150
150 def setUp(self):151 def setUp(self):
151 TestCase.setUp(self)152 super(SFTPNonServerTest, self).setUp()
152 self.requireFeature(features.paramiko)153 self.requireFeature(features.paramiko)
153154
154 def test_parse_url_with_home_dir(self):155 def test_parse_url_with_home_dir(self):
@@ -361,7 +362,7 @@
361class TestSocketDelay(TestCase):362class TestSocketDelay(TestCase):
362363
363 def setUp(self):364 def setUp(self):
364 TestCase.setUp(self)365 super(TestSocketDelay, self).setUp()
365 self.requireFeature(features.paramiko)366 self.requireFeature(features.paramiko)
366367
367 def test_delay(self):368 def test_delay(self):
368369
=== modified file 'bzrlib/tests/test_smart.py'
--- bzrlib/tests/test_smart.py 2012-02-23 19:45:15 +0000
+++ bzrlib/tests/test_smart.py 2012-08-04 14:30:26 +0000
@@ -82,7 +82,7 @@
8282
83 def setUp(self):83 def setUp(self):
84 self.vfs_transport_factory = memory.MemoryServer84 self.vfs_transport_factory = memory.MemoryServer
85 tests.TestCaseWithTransport.setUp(self)85 super(TestCaseWithChrootedTransport, self).setUp()
86 self._chroot_server = None86 self._chroot_server = None
8787
88 def get_transport(self, relpath=None):88 def get_transport(self, relpath=None):
@@ -1058,7 +1058,7 @@
1058 """Base test case for verbs that implement set_last_revision."""1058 """Base test case for verbs that implement set_last_revision."""
10591059
1060 def setUp(self):1060 def setUp(self):
1061 tests.TestCaseWithMemoryTransport.setUp(self)1061 super(SetLastRevisionTestBase, self).setUp()
1062 backing_transport = self.get_transport()1062 backing_transport = self.get_transport()
1063 self.request = self.request_class(backing_transport)1063 self.request = self.request_class(backing_transport)
1064 self.tree = self.make_branch_and_memory_tree('.')1064 self.tree = self.make_branch_and_memory_tree('.')
@@ -1373,9 +1373,6 @@
13731373
1374class TestSmartServerBranchRequestLockWrite(TestLockedBranch):1374class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
13751375
1376 def setUp(self):
1377 tests.TestCaseWithMemoryTransport.setUp(self)
1378
1379 def test_lock_write_on_unlocked_branch(self):1376 def test_lock_write_on_unlocked_branch(self):
1380 backing = self.get_transport()1377 backing = self.get_transport()
1381 request = smart_branch.SmartServerBranchRequestLockWrite(backing)1378 request = smart_branch.SmartServerBranchRequestLockWrite(backing)
@@ -1481,9 +1478,6 @@
14811478
1482class TestSmartServerBranchRequestGetPhysicalLockStatus(TestLockedBranch):1479class TestSmartServerBranchRequestGetPhysicalLockStatus(TestLockedBranch):
14831480
1484 def setUp(self):
1485 tests.TestCaseWithMemoryTransport.setUp(self)
1486
1487 def test_true(self):1481 def test_true(self):
1488 backing = self.get_transport()1482 backing = self.get_transport()
1489 request = smart_branch.SmartServerBranchRequestGetPhysicalLockStatus(1483 request = smart_branch.SmartServerBranchRequestGetPhysicalLockStatus(
@@ -1509,9 +1503,6 @@
15091503
1510class TestSmartServerBranchRequestUnlock(TestLockedBranch):1504class TestSmartServerBranchRequestUnlock(TestLockedBranch):
15111505
1512 def setUp(self):
1513 tests.TestCaseWithMemoryTransport.setUp(self)
1514
1515 def test_unlock_on_locked_branch_and_repo(self):1506 def test_unlock_on_locked_branch_and_repo(self):
1516 backing = self.get_transport()1507 backing = self.get_transport()
1517 request = smart_branch.SmartServerBranchRequestUnlock(backing)1508 request = smart_branch.SmartServerBranchRequestUnlock(backing)
@@ -2201,9 +2192,6 @@
22012192
2202class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):2193class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
22032194
2204 def setUp(self):
2205 tests.TestCaseWithMemoryTransport.setUp(self)
2206
2207 def test_unlock_on_locked_repo(self):2195 def test_unlock_on_locked_repo(self):
2208 backing = self.get_transport()2196 backing = self.get_transport()
2209 request = smart_repo.SmartServerRepositoryUnlock(backing)2197 request = smart_repo.SmartServerRepositoryUnlock(backing)
22102198
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- bzrlib/tests/test_smart_transport.py 2012-02-23 23:41:51 +0000
+++ bzrlib/tests/test_smart_transport.py 2012-08-04 14:30:26 +0000
@@ -3388,7 +3388,7 @@
3388 """3388 """
33893389
3390 def setUp(self):3390 def setUp(self):
3391 tests.TestCase.setUp(self)3391 super(TestResponseEncoderBufferingProtocolThree, self).setUp()
3392 self.writes = []3392 self.writes = []
3393 self.responder = protocol.ProtocolThreeResponder(self.writes.append)3393 self.responder = protocol.ProtocolThreeResponder(self.writes.append)
33943394
33953395
=== modified file 'bzrlib/tests/test_symbol_versioning.py'
--- bzrlib/tests/test_symbol_versioning.py 2011-01-12 01:01:53 +0000
+++ bzrlib/tests/test_symbol_versioning.py 2012-08-04 14:30:26 +0000
@@ -222,7 +222,7 @@
222class TestSuppressAndActivate(TestCase):222class TestSuppressAndActivate(TestCase):
223223
224 def setUp(self):224 def setUp(self):
225 TestCase.setUp(self)225 super(TestSuppressAndActivate, self).setUp()
226 existing_filters = list(warnings.filters)226 existing_filters = list(warnings.filters)
227 def restore():227 def restore():
228 warnings.filters[:] = existing_filters228 warnings.filters[:] = existing_filters
229229
=== modified file 'bzrlib/tests/test_wsgi.py'
--- bzrlib/tests/test_wsgi.py 2011-12-23 10:01:08 +0000
+++ bzrlib/tests/test_wsgi.py 2012-08-04 14:30:26 +0000
@@ -68,7 +68,7 @@
68class TestWSGI(tests.TestCaseInTempDir, WSGITestMixin):68class TestWSGI(tests.TestCaseInTempDir, WSGITestMixin):
6969
70 def setUp(self):70 def setUp(self):
71 tests.TestCase.setUp(self)71 super(TestWSGI, self).setUp()
72 self.status = None72 self.status = None
73 self.headers = None73 self.headers = None
7474
7575
=== modified file 'bzrlib/tests/test_xml.py'
--- bzrlib/tests/test_xml.py 2012-01-27 18:41:15 +0000
+++ bzrlib/tests/test_xml.py 2012-08-04 14:30:26 +0000
@@ -500,7 +500,7 @@
500 """Whitebox testing of the _encode_and_escape function."""500 """Whitebox testing of the _encode_and_escape function."""
501501
502 def setUp(self):502 def setUp(self):
503 TestCase.setUp(self)503 super(TestEncodeAndEscape, self).setUp()
504 # Keep the cache clear before and after the test504 # Keep the cache clear before and after the test
505 bzrlib.xml_serializer._clear_cache()505 bzrlib.xml_serializer._clear_cache()
506 self.addCleanup(bzrlib.xml_serializer._clear_cache)506 self.addCleanup(bzrlib.xml_serializer._clear_cache)