Merge lp:~jml/launchpad/upcall-testcase into lp:launchpad

[Jonathan Lange]

Upcall setUp and tearDown everywhere, allowing use of testtools

[Jonathan Lange (jml)]

This branch is pretty simple in intent. It goes through many, many test cases and makes them upcall setUp and tearDown.

It's a prequisite for using testtools, which mandates upcalling setUp & tearDown to avoid more painful errors.

I've also changed a lot of the upcalls to be new-style.

[Michael Hudson-Doyle (mwhudson)]

It looks fine. I worry slightly about doing super(...).setUp(argument), but only slightly.

review: Approve

=== modified file 'lib/canonical/config/tests/test_config_lookup.py'
--- lib/canonical/config/tests/test_config_lookup.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/config/tests/test_config_lookup.py	2010-01-08 04:12:19 +0000
@@ -8,18 +8,17 @@
 
 import os
 import shutil
+from tempfile import mkdtemp, NamedTemporaryFile
 import unittest
 
-from tempfile import mkdtemp, NamedTemporaryFile
-from unittest import makeSuite, TestCase, TestSuite
-
-import lp.testing
-
 from canonical import config
+from lp.testing import TestCase
+
 
 class TestConfigLookup(TestCase):
 
     def setUp(self):
+        super(TestConfigLookup, self).setUp()
         self.temp_lookup_file = None
         self.original_CONFIG_LOOKUP_FILES = config.CONFIG_LOOKUP_FILES
         self.original_LPCONFIG = os.environ['LPCONFIG']
@@ -28,6 +27,7 @@
         del self.temp_lookup_file
         config.CONFIG_LOOKUP_FILES = self.original_CONFIG_LOOKUP_FILES
         os.environ['LPCONFIG'] = self.original_LPCONFIG
+        super(TestConfigLookup, self).tearDown()
 
     def makeLookupFile(self):
         self.temp_lookup_file = NamedTemporaryFile()
@@ -61,7 +61,7 @@
             config.find_instance_name(), config.DEFAULT_CONFIG)
 
 
-class ConfigTestCase(lp.testing.TestCase):
+class ConfigTestCase(TestCase):
     """Base test case that provides fixtures for testing configuration.
     """
 
@@ -79,7 +79,6 @@
         shutil.rmtree(self.temp_config_root_dir)
         config.CONFIG_ROOT_DIRS = self.original_root_dirs
 
-
     def setUpInstanceConfig(self, instance_name):
         """Create an instance directory with empty config files.
 
@@ -104,6 +103,7 @@
     """Test where instance config directories are looked up."""
 
     def setUp(self):
+        super(TestInstanceConfigDirLookup, self).setUp()
         self.setUpConfigRoots()
 
     def test_find_config_dir_raises_ValueError(self):

=== modified file 'lib/canonical/launchpad/scripts/tests/test_hwdb_submission_parser.py'
--- lib/canonical/launchpad/scripts/tests/test_hwdb_submission_parser.py	2009-10-27 14:36:03 +0000
+++ lib/canonical/launchpad/scripts/tests/test_hwdb_submission_parser.py	2010-01-08 04:12:19 +0000
@@ -25,12 +25,14 @@
 
 from lp.testing import TestCase, validate_mock_class
 
+
 class SubmissionParserTestParseSoftware(SubmissionParser):
     """A Variant used to test SubmissionParser._parseSoftware.
 
     This class can be used to test the regular case of
     submission data.
     """
+
     def __init__(self, test, logger=None):
         super(SubmissionParserTestParseSoftware, self).__init__(logger)
         self.test = test
@@ -54,6 +56,7 @@
     This class is intended to test submission data that does not contain
     a <xorg> node.
     """
+
     def __init__(self, test, logger=None):
         super(SubmissionParserTestParseSoftwareNoXorgNode, self).__init__(
             logger)
@@ -74,6 +77,7 @@
     This class is intended to test submission data that does not contain
     a <packages> node.
     """
+
     def __init__(self, test, logger=None):
         super(SubmissionParserTestParseSoftwareNoPackagesNode, self).__init__(
             logger)
@@ -95,6 +99,7 @@
 
     def setUp(self):
         """Setup the test environment."""
+        super(TestHWDBSubmissionParser, self).setUp()
         self.log = logging.getLogger('test_hwdb_submission_parser')
         self.log.setLevel(logging.INFO)
         self.handler = Handler(self)
@@ -250,7 +255,7 @@
                     {'name': 'architecture_info',
                      'version': '1.1'},
                     {'name': 'find_network_controllers',
-                     'version': '2.34'}]}
+                     'version': '2.34'}]},
             }
         self.assertEqual(
             summary, expected_data,
@@ -293,7 +298,7 @@
                 'plugins': [
                     {
                         'name': 'architecture_info',
-                        'version': '1.1'
+                        'version': '1.1',
                         },
                     {
                         'name': 'find_network_controllers',
@@ -484,7 +489,6 @@
             """)
         self.assertRaises(ValueError, parser._parseProperties, node)
 
-
     def testDevice(self):
         """A device node is converted into a dictionary."""
         test = self
@@ -919,6 +923,7 @@
 
         All "method substitutes" return a valid result.
         """
+
         def __init__(self, logger=None):
             super(self.__class__, self).__init__(logger)
             self.hal_result = 'parsed HAL data'
@@ -1312,6 +1317,7 @@
 
         All "method substitutes" return a valid result.
         """
+
         def __init__(self, logger=None):
             SubmissionParser.__init__(self, logger)
             self.summary_result = 'parsed summary'
@@ -1363,8 +1369,8 @@
             'summary': 'parsed summary',
             'hardware': 'parsed hardware',
             'software': 'parsed software',
-            'questions':  'parsed questions',
-            'context':  'parsed context',
+            'questions': 'parsed questions',
+            'context': 'parsed context',
             }
 
         result = parser.parseMainSections(node)
@@ -1550,7 +1556,7 @@
             'hardware': {
                 'udev': udev,
                 'sysfs-attributes': sysfs_attributes,
-                'processors': processors
+                'processors': processors,
                 },
             'software': {
                 'packages': packages
@@ -1579,7 +1585,7 @@
             ]
         processors = [
             {'id': 1},
-            {'id': 2}
+            {'id': 2},
             ]
         packages = {
             'bzr': {'id': 4},
@@ -1589,7 +1595,7 @@
             'hardware': {
                 'udev': udev,
                 'sysfs-attributes': sysfs_attributes,
-                'processors': processors
+                'processors': processors,
                 },
             'software': {
                 'packages': packages
@@ -1646,7 +1652,7 @@
         submission = {
             'hardware': {
                 'udev': devices,
-                'processors': processors
+                'processors': processors,
                 },
             'software': {
                 'packages': packages
@@ -1707,8 +1713,7 @@
          {'udi': DEVICE_2_UDI,
           'properties': {
               'info.parent': (ROOT_UDI,
-                              'dbus.String')}
-         }]
+                              'dbus.String')}}]
 
     def testUDIDeviceMap(self):
         """Test the creation of the mapping UDI -> device."""
@@ -1893,7 +1898,7 @@
                    'properties':
                        {'info.parent':
                             (self.CIRCULAR_UDI_1, 'str')}}
-        devices = [device1, device2, circular_device1,  circular_device2]
+        devices = [device1, device2, circular_device1, circular_device2]
         parser = SubmissionParser()
         udi_device_map = parser.getUDIDeviceMap(devices)
         udi_children = parser.getUDIChildren(udi_device_map)

=== modified file 'lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py'
--- lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py	2009-11-05 15:12:46 +0000
+++ lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py	2010-01-08 04:12:19 +0000
@@ -34,6 +34,7 @@
 
 from lp.testing import TestCase, validate_mock_class
 
+
 class TestCaseHWDB(TestCase):
     """Common base class for HWDB processing tests."""
 
@@ -91,6 +92,7 @@
 
     def setUp(self):
         """Setup the test environment."""
+        super(TestCaseHWDB, self).setUp()
         self.log = logging.getLogger('test_hwdb_submission_parser')
         self.log.setLevel(logging.INFO)
         self.handler = Handler(self)
@@ -4534,6 +4536,7 @@
 
     def setUp(self):
         """Setup the test environment."""
+        super(TestHWDBSubmissionTablePopulation, self).setUp()
         self.log = logging.getLogger('test_hwdb_submission_parser')
         self.log.setLevel(logging.INFO)
         self.handler = Handler(self)

=== modified file 'lib/canonical/launchpad/scripts/tests/test_runlaunchpad.py'
--- lib/canonical/launchpad/scripts/tests/test_runlaunchpad.py	2009-08-12 19:07:45 +0000
+++ lib/canonical/launchpad/scripts/tests/test_runlaunchpad.py	2010-01-08 04:12:19 +0000
@@ -6,7 +6,7 @@
 __metaclass__ = type
 __all__ = [
     'CommandLineArgumentProcessing',
-    'ServersToStart'
+    'ServersToStart',
     ]
 
 
@@ -68,11 +68,11 @@
             split_out_runlaunchpad_arguments(['-o', 'foo', '--bar=baz']))
 
 
-
 class TestDefaultConfigArgument(lp.testing.TestCase):
     """Tests for the processing of the -C argument."""
 
     def setUp(self):
+        super(TestDefaultConfigArgument, self).setUp()
         self.config_root = tempfile.mkdtemp('configs')
         self.saved_instance = config.instance_name
         self.saved_config_roots = canonical.config.CONFIG_ROOT_DIRS

=== modified file 'lib/canonical/launchpad/webapp/tests/__init__.py'
--- lib/canonical/launchpad/webapp/tests/__init__.py	2009-08-20 13:32:32 +0000
+++ lib/canonical/launchpad/webapp/tests/__init__.py	2010-01-08 04:12:19 +0000
@@ -21,10 +21,11 @@
     """A test case that installs a DummyWebServiceConfiguration."""
 
     def setUp(self):
+        super(DummyConfigurationTestCase, self).setUp()
         self.config = DummyWebServiceConfiguration()
         provideUtility(self.config, IWebServiceConfiguration)
 
     def tearDown(self):
         getGlobalSiteManager().unregisterUtility(
             self.config, IWebServiceConfiguration)
-
+        super(DummyConfigurationTestCase, self).tearDown()

=== modified file 'lib/canonical/launchpad/webapp/tests/test_dbpolicy.py'
--- lib/canonical/launchpad/webapp/tests/test_dbpolicy.py	2009-10-13 05:48:15 +0000
+++ lib/canonical/launchpad/webapp/tests/test_dbpolicy.py	2010-01-08 04:12:19 +0000
@@ -60,12 +60,14 @@
     policy = None
 
     def setUp(self):
+        super(BaseDatabasePolicyTestCase, self).setUp()
         if self.policy is None:
             self.policy = BaseDatabasePolicy()
         getUtility(IStoreSelector).push(self.policy)
 
     def tearDown(self):
         getUtility(IStoreSelector).pop()
+        super(BaseDatabasePolicyTestCase, self).tearDown()
 
     def test_correctly_implements_IDatabasePolicy(self):
         self.assertProvides(self.policy, IDatabasePolicy)
@@ -77,7 +79,7 @@
     def setUp(self):
         if self.policy is None:
             self.policy = SlaveDatabasePolicy()
-        BaseDatabasePolicyTestCase.setUp(self)
+        super(SlaveDatabasePolicyTestCase, self).setUp()
 
     def test_defaults(self):
         for store in ALL_STORES:
@@ -97,7 +99,7 @@
 
     def setUp(self):
         self.policy = SlaveOnlyDatabasePolicy()
-        BaseDatabasePolicyTestCase.setUp(self)
+        super(SlaveOnlyDatabasePolicyTestCase, self).setUp()
 
     def test_master_allowed(self):
         for store in ALL_STORES:
@@ -111,7 +113,7 @@
 
     def setUp(self):
         self.policy = MasterDatabasePolicy()
-        BaseDatabasePolicyTestCase.setUp(self)
+        super(MasterDatabasePolicyTestCase, self).setUp()
 
     def test_XMLRPCRequest_uses_MasterPolicy(self):
         """XMLRPC should always use the master flavor, since they always
@@ -139,10 +141,11 @@
     This test just checks the defaults, which is the same as the
     slave policy for unauthenticated requests.
     """
+
     def setUp(self):
         request = LaunchpadTestRequest(SERVER_URL='http://launchpad.dev')
         self.policy = LaunchpadDatabasePolicy(request)
-        SlaveDatabasePolicyTestCase.setUp(self)
+        super(LaunchpadDatabasePolicyTestCase, self).setUp()
 
 
 class LayerDatabasePolicyTestCase(TestCase):
@@ -243,7 +246,7 @@
 
     def setUp(self):
         self.policy = ReadOnlyLaunchpadDatabasePolicy()
-        BaseDatabasePolicyTestCase.setUp(self)
+        super(ReadOnlyLaunchpadDatabasePolicyTestCase, self).setUp()
 
     def test_defaults(self):
         # default Store is the slave.

=== modified file 'lib/canonical/launchpad/webapp/tests/test_menu.py'
--- lib/canonical/launchpad/webapp/tests/test_menu.py	2009-08-05 17:19:14 +0000
+++ lib/canonical/launchpad/webapp/tests/test_menu.py	2010-01-08 04:12:19 +0000
@@ -36,6 +36,7 @@
 
     def tearDown(self):
         logout()
+        super(TestMenuBaseLinkCaching, self).tearDown()
 
     def test_no_cache_when_there_is_no_request(self):
         # Calling login() would cause a new interaction to be setup with a

=== modified file 'lib/canonical/launchpad/webapp/tests/test_servers.py'
--- lib/canonical/launchpad/webapp/tests/test_servers.py	2009-09-17 14:23:16 +0000
+++ lib/canonical/launchpad/webapp/tests/test_servers.py	2010-01-08 04:12:19 +0000
@@ -418,7 +418,7 @@
             {'QUERY_STRING': "a=1&b=2&c=3", 'REQUEST_METHOD': 'POST'})
         self.assertEqual(request.method, 'POST')
         self.assertEqual(
-            {'a':['1'], 'b': ['2'], 'c': ['3']},
+            {'a': ['1'], 'b': ['2'], 'c': ['3']},
             request.query_string_params,
             "The query_string_params dict is populated from the "
             "QUERY_STRING during POST requests.")
@@ -461,4 +461,3 @@
         optionflags=NORMALIZE_WHITESPACE | ELLIPSIS))
     suite.addTest(unittest.TestLoader().loadTestsFromName(__name__))
     return suite
-

=== modified file 'lib/lp/archiveuploader/tests/test_buildduploads.py'
--- lib/lp/archiveuploader/tests/test_buildduploads.py	2009-08-28 07:34:44 +0000
+++ lib/lp/archiveuploader/tests/test_buildduploads.py	2010-01-08 04:12:19 +0000
@@ -70,7 +70,7 @@
 
         real_policy = self.policy
         self.policy = 'insecure'
-        TestStagedBinaryUploadBase.setUp(self)
+        super(TestBuilddUploads, self).setUp()
         self.policy = real_policy
 
     def _publishBuildQueueItem(self, queue_item):
@@ -125,6 +125,6 @@
             build_used.title)
         self.assertEqual('FULLYBUILT', build_used.buildstate.name)
 
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
-

=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2009-11-18 02:58:23 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2010-01-08 04:12:19 +0000
@@ -50,7 +50,7 @@
         Additionally to the TestUploadProcessorBase.setUp, set 'breezy'
         distroseries and an new uploadprocessor instance.
         """
-        TestUploadProcessorBase.setUp(self)
+        super(TestPPAUploadProcessorBase, self).setUp()
         self.ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         # Let's make 'name16' person member of 'launchpad-beta-tester'
         # team only in the context of this test.

=== modified file 'lib/lp/archiveuploader/tests/test_securityuploads.py'
--- lib/lp/archiveuploader/tests/test_securityuploads.py	2009-08-28 07:34:44 +0000
+++ lib/lp/archiveuploader/tests/test_securityuploads.py	2010-01-08 04:12:19 +0000
@@ -67,7 +67,7 @@
         6. Clean log messages.
         7. Commit transaction, so the upload source can be seen.
         """
-        TestUploadProcessorBase.setUp(self)
+        super(TestStagedBinaryUploadBase, self).setUp()
         self.options.context = self.policy
         self.options.nomails = self.no_mails
         # Set up the uploadprocessor with appropriate options and logger
@@ -164,7 +164,7 @@
 
     def setUp(self):
         """Setup base class and create the required new distroarchseries."""
-        TestStagedBinaryUploadBase.setUp(self)
+        super(TestStagedSecurityUploads, self).setUp()
         distribution = getUtility(IDistributionSet).getByName(
             self.distribution_name)
         distroseries = distribution[self.distroseries.name]

=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-18 02:58:23 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-01-08 04:12:19 +0000
@@ -107,7 +107,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self)
+        super(TestUploadProcessorBase, self).setUp()
 
         self.queue_folder = tempfile.mkdtemp()
         os.makedirs(os.path.join(self.queue_folder, "incoming"))
@@ -134,6 +134,7 @@
 
     def tearDown(self):
         shutil.rmtree(self.queue_folder)
+        super(TestUploadProcessorBase, self).tearDown()
 
     def assertLogContains(self, line):
         """Assert if a given line is present in the log messages."""

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2009-11-13 21:16:15 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2010-01-08 04:12:19 +0000
@@ -119,12 +119,13 @@
     layer = LaunchpadFunctionalLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self)
+        super(TestBranchView, self).setUp()
         login(ANONYMOUS)
         self.request = LaunchpadTestRequest()
 
     def tearDown(self):
         logout()
+        super(TestBranchView, self).tearDown()
 
     def testMirrorStatusMessageIsTruncated(self):
         """mirror_status_message is truncated if the text is overly long."""
@@ -238,13 +239,14 @@
     layer = DatabaseFunctionalLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self)
+        super(TestBranchAddView, self).setUp()
         self.person = self.factory.makePerson()
         login_person(self.person)
         self.request = LaunchpadTestRequest()
 
     def tearDown(self):
         logout()
+        super(TestBranchAddView, self).tearDown()
 
     def get_view(self, context):
         view = BranchAddView(context, self.request)

=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py	2009-10-23 19:33:09 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py	2010-01-08 04:12:19 +0000
@@ -127,12 +127,13 @@
     layer = ZopelessAppServerLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self, user='[e-mail]')
+        super(TestCodeHandler, self).setUp(user='[e-mail]')
         self.code_handler = CodeHandler()
         self._old_policy = setSecurityPolicy(LaunchpadSecurityPolicy)
 
     def tearDown(self):
         setSecurityPolicy(self._old_policy)
+        super(TestCodeHandler, self).tearDown()
 
     def switchDbUser(self, user):
         """Commit the transactionand switch to the new user."""
@@ -1060,6 +1061,7 @@
     # We don't need no stinking layer.
 
     def setUp(self):
+        super(TestVoteEmailCommand, self).setUp()
         class FakeExecutionContext:
             vote = None
             vote_tags = None
@@ -1149,7 +1151,8 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self, user='[e-mail]')
+        super(TestUpdateStatusEmailCommand, self).setUp(
+            user='[e-mail]')
         self._old_policy = setSecurityPolicy(LaunchpadSecurityPolicy)
         self.merge_proposal = self.factory.makeBranchMergeProposal()
         # Default the user to be the target branch owner, so they are
@@ -1161,6 +1164,7 @@
 
     def tearDown(self):
         setSecurityPolicy(self._old_policy)
+        super(TestUpdateStatusEmailCommand, self).tearDown()
 
     def test_numberOfArguments(self):
         # The command needs one and only one arg.
@@ -1257,7 +1261,8 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self, user='[e-mail]')
+        super(TestAddReviewerEmailCommand, self).setUp(
+            user='[e-mail]')
         self._old_policy = setSecurityPolicy(LaunchpadSecurityPolicy)
         self.merge_proposal = self.factory.makeBranchMergeProposal()
         # Default the user to be the target branch owner, so they are
@@ -1270,6 +1275,7 @@
 
     def tearDown(self):
         setSecurityPolicy(self._old_policy)
+        super(TestAddReviewerEmailCommand, self).tearDown()
 
     def test_numberOfArguments(self):
         # The command needs at least one arg.

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2009-12-11 00:56:16 +0000
+++ lib/lp/code/model/tests/test_branch.py	2010-01-08 04:12:19 +0000
@@ -75,6 +75,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestCodeImport, self).setUp()
         login('[e-mail]')
         self.factory = LaunchpadObjectFactory()
 
@@ -650,6 +651,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestBranchDeletionConsequences, self).setUp()
         login('[e-mail]')
         self.factory = LaunchpadObjectFactory()
         # Has to be a product branch because of merge proposals.
@@ -1035,7 +1037,7 @@
     layer = DatabaseFunctionalLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self, '[e-mail]')
+        super(BranchAddLandingTarget, self).setUp('[e-mail]')
         self.product = self.factory.makeProduct()
 
         self.user = self.factory.makePerson()
@@ -1048,6 +1050,7 @@
 
     def tearDown(self):
         logout()
+        super(BranchAddLandingTarget, self).tearDown()
 
     def test_junkSource(self):
         """Junk branches cannot be used as a source for merge proposals."""

=== modified file 'lib/lp/code/model/tests/test_codereviewkarma.py'
--- lib/lp/code/model/tests/test_codereviewkarma.py	2009-06-25 04:06:00 +0000
+++ lib/lp/code/model/tests/test_codereviewkarma.py	2010-01-08 04:12:19 +0000
@@ -29,7 +29,7 @@
     def setUp(self):
         # Use an admin to get launchpad.Edit on all the branches to easily
         # approve and reject the proposals.
-        TestCaseWithFactory.setUp(self, '[e-mail]')
+        super(TestCodeReviewKarma, self).setUp('[e-mail]')
         # The way the zope infrastructure works is that we can register
         # subscribers easily, but there is no way to unregister them (bug
         # 2338).  TestEventListener does this with by setting a property to
@@ -46,6 +46,7 @@
 
     def tearDown(self):
         self.karma_listener.unregister()
+        super(TestCodeReviewKarma, self).tearDown()
 
     def _on_karma_assigned(self, object, event):
         # Store the karma event for checking in the test method.

=== modified file 'lib/lp/code/model/tests/test_revisionauthor.py'
--- lib/lp/code/model/tests/test_revisionauthor.py	2009-06-25 04:06:00 +0000
+++ lib/lp/code/model/tests/test_revisionauthor.py	2010-01-08 04:12:19 +0000
@@ -33,6 +33,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestRevisionEmailExtraction, self).setUp()
         LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
 
     def test_email_extracted_from_name(self):
@@ -132,6 +133,7 @@
 
     def setUp(self):
         # Create a revision author that doesn't have a user yet.
+        super(TestNewlyValidatedEmailsLinkRevisionAuthors, self).setUp()
         launchpad_dbuser = config.launchpad.dbuser
         LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
         self.author = RevisionSet()._createRevisionAuthor(
@@ -171,6 +173,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestRevisionAuthor, self).setUp()
         LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
 
     def testGetNameWithoutEmailReturnsNamePart(self):

=== modified file 'lib/lp/codehosting/puller/tests/test_worker.py'
--- lib/lp/codehosting/puller/tests/test_worker.py	2009-12-22 23:50:27 +0000
+++ lib/lp/codehosting/puller/tests/test_worker.py	2010-01-08 04:12:19 +0000
@@ -566,6 +566,7 @@
     """Tests specific to `MirroredBranchPolicy`."""
 
     def setUp(self):
+        super(TestMirroredBranchPolicy, self).setUp()
         self.factory = LaunchpadObjectFactory()
 
     def testNoFileURL(self):

=== modified file 'lib/lp/codehosting/tests/test_rewrite.py'
--- lib/lp/codehosting/tests/test_rewrite.py	2009-11-05 19:06:56 +0000
+++ lib/lp/codehosting/tests/test_rewrite.py	2010-01-08 04:12:19 +0000
@@ -28,7 +28,7 @@
     layer = DatabaseFunctionalLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self)
+        super(TestBranchRewriter, self).setUp()
         self.fake_time = FakeTime(0)
 
     def makeRewriter(self):

=== modified file 'lib/lp/registry/tests/test_distroseries.py'
--- lib/lp/registry/tests/test_distroseries.py	2009-08-28 07:34:44 +0000
+++ lib/lp/registry/tests/test_distroseries.py	2010-01-08 04:12:19 +0000
@@ -34,6 +34,7 @@
 
     def setUp(self):
         # Log in as an admin, so that we can create distributions.
+        super(TestDistroSeriesCurrentSourceReleases, self).setUp()
         login('[e-mail]')
         self.publisher = SoyuzTestPublisher()
         self.factory = self.publisher.factory

=== modified file 'lib/lp/registry/tests/test_prf_walker.py'
--- lib/lp/registry/tests/test_prf_walker.py	2009-07-17 18:46:25 +0000
+++ lib/lp/registry/tests/test_prf_walker.py	2010-01-08 04:12:19 +0000
@@ -177,6 +177,7 @@
 
     def tearDown(self):
         reset_logging()
+        super(WalkerBase_walk, self).tearDown()
 
     def test_walk_UnicodeEncodeError(self):
         """Verify that a UnicodeEncodeError is logged."""
@@ -311,6 +312,7 @@
 
     def tearDown(self):
         reset_logging()
+        super(HTTPWalker_ListDir, self).tearDown()
 
     def setUpWalker(self, listing_url, listing_content):
         from lp.registry.scripts.productreleasefinder.walker import (
@@ -487,6 +489,7 @@
 
     def tearDown(self):
         reset_logging()
+        super(HTTPWalker_IsDirectory, self).tearDown()
 
     def testFtpIsDirectory(self):
         # Test that no requests are made by isDirectory() when walking

=== modified file 'lib/lp/scripts/utilities/tests/test_sanitizedb.py'
--- lib/lp/scripts/utilities/tests/test_sanitizedb.py	2009-10-01 03:54:04 +0000
+++ lib/lp/scripts/utilities/tests/test_sanitizedb.py	2010-01-08 04:12:19 +0000
@@ -20,6 +20,7 @@
     layer = DatabaseLayer
 
     def setUp(self):
+        super(SanitizeDbScriptTestCase, self).setUp()
         self.script_path = os.path.join(
             config.root, 'utilities', 'sanitize-db.py')
         DatabaseLayer.force_dirty_database()

=== modified file 'lib/lp/services/apachelogparser/tests/test_apachelogparser.py'
--- lib/lp/services/apachelogparser/tests/test_apachelogparser.py	2009-11-17 18:36:20 +0000
+++ lib/lp/services/apachelogparser/tests/test_apachelogparser.py	2010-01-08 04:12:19 +0000
@@ -230,6 +230,7 @@
     root = os.path.join(here, 'apache-log-files')
 
     def setUp(self):
+        super(TestParsedFilesDetection, self).setUp()
         self.layer.switchDbUser(DBUSER)
 
     def test_not_parsed_file(self):
@@ -301,6 +302,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(Test_create_or_update_parsedlog_entry, self).setUp()
         self.layer.switchDbUser(DBUSER)
 
     def test_creation_of_new_entries(self):

=== modified file 'lib/lp/services/database/tests/test_prejoin.py'
--- lib/lp/services/database/tests/test_prejoin.py	2009-10-28 12:38:31 +0000
+++ lib/lp/services/database/tests/test_prejoin.py	2010-01-08 04:12:19 +0000
@@ -20,6 +20,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(PrejoinTestCase, self).setUp()
         self.store = IMasterStore(Product)
 
         # All products

=== modified file 'lib/lp/services/mail/tests/test_mailbox.py'
--- lib/lp/services/mail/tests/test_mailbox.py	2009-06-30 16:56:07 +0000
+++ lib/lp/services/mail/tests/test_mailbox.py	2010-01-08 04:12:19 +0000
@@ -19,12 +19,10 @@
 class TestDirectoryMailBox(TestCase):
 
     def setUp(self):
+        super(TestDirectoryMailBox, self).setUp()
         # Create a temp directory.
         self.email_dir = tempfile.mkdtemp()
-
-    def tearDown(self):
-        # Delete the directory.
-        rmtree(self.email_dir)
+        self.addCleanup(rmtree, self.email_dir)
 
     def test_verify_interface(self):
         # Make sure that the object actually implements the interface.

=== modified file 'lib/lp/services/memcache/tests/test_memcache_client.py'
--- lib/lp/services/memcache/tests/test_memcache_client.py	2009-10-15 13:04:44 +0000
+++ lib/lp/services/memcache/tests/test_memcache_client.py	2010-01-08 04:12:19 +0000
@@ -18,6 +18,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(MemcacheClientTestCase, self).setUp()
         self.client = getUtility(IMemcacheClient)
 
     def test_basics(self):

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-12-21 12:54:47 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-01-08 04:12:19 +0000
@@ -1236,6 +1236,7 @@
         The records annotated will be excluded during the operation checks,
         see checkCopies().
         """
+        super(CopyPackageTestCase, self).setUp()
         pending_sources = SecureSourcePackagePublishingHistory.selectBy(
             status=PackagePublishingStatus.PENDING)
         self.sources_pending_ids = [pub.id for pub in pending_sources]

=== modified file 'lib/lp/translations/scripts/tests/test_remove_translations.py'
--- lib/lp/translations/scripts/tests/test_remove_translations.py	2009-10-17 14:06:03 +0000
+++ lib/lp/translations/scripts/tests/test_remove_translations.py	2010-01-08 04:12:19 +0000
@@ -45,6 +45,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestRemoveTranslationsConstraints, self).setUp()
         # Acquire privileges to delete TranslationMessages.  We won't
         # actually do that here, but we'll go through all the motions.
         self.layer.switchDbUser('postgres')
@@ -155,6 +156,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestRemoveTranslationsOptionsHandling, self).setUp()
         self.factory = LaunchpadObjectFactory()
 
     def test_WithNativeArgs(self):
@@ -222,6 +224,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestRemoveTranslations, self).setUp()
         # Acquire privileges to delete TranslationMessages.  That's not
         # something we normally do.  Actually we should test under
         # rosettaadmin, but that user does not have all the privileges
@@ -553,6 +556,7 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
+        super(TestRemoveTranslationsUnmasking, self).setUp()
         self.layer.switchDbUser('postgres')
 
         # Set up a template with a Laotian translation file.  There's