On Thu, Sep 30, 2010 at 11:02 AM, Aaron Bentley <email address hidden> wrote:
> Review: Needs Fixing
> Waiting for children to exit will mean that no new jobs can be processed until all the jobs complete.  This may severely impair responsiveness.  I suggest starting the subprocesses and then exiting.


It no longer waits for child processes by default. I added an option
to wait, which is convenient when running it from the command line
when experimenting.


> The NoErrorOptionParser should not exist.  Option handling should be taken care of in the ProcessJobSource class.  If the layering is getting in our way, we should fix it, not work around it.


I moved most of the setup code to the run() methods in LaunchpadScript
and LaunchpadCronScript so __init__ does very little now besides
setting up the parser attribute.


> Unless you are specifically testing stringification, you should not stringify objects in tests, so that your tests are not fragile.

Fixed.

> In test_setstatus_admin, what's the purpose of transaction.commit?

I'm not sure why I was thinking I would need that. Removed.

> Since you do person_set.getByEmail('<email address hidden>'), you can use login_person or with person_logged_in instead of login.  Also, lifeless requested that you use the constant for <email address hidden>' instead of spelling it out.

Fixed.

> Please use lp.testing.run_script instead of rolling your own.

Fixed.

> In test_processed, I don't think you really care what the database id of the job is, so use  assertTextMatchesExpressionIgnoreWhitespace.  (You'll need to move it to TestCaseWithFactory.)

Fixed.


> get isn't required to run jobs under the non-twisted job runner, so it seems like an unnecessary requirement on IJobSource.

ok, I've moved get() to a new ITwistedJobSource interface.

> Perhaps ProcessJobSource should go in lp.services.job.runner ?

I'd rather wait until we have a reason for subclassing from it, which
I hope won't happen before we stop using cron for job processing.


> test_empty_queue looks fragile because it includes the directory of the lock file.  Perhaps another case for assertTextMatchesExpressionIgnoreWhitespace?

Fixed.


> Perhaps PYTHONPATH and LPCONFIG should be handled by common code, eg:
> for name in ['PYTHONPATH', 'LPCONFIG']:
>    if name in os.environ:
>        env[name] = os.environ[name]

Fixed.




Incremental diff:


=== modified file 'cronscripts/process-job-source-groups.py'
--- cronscripts/process-job-source-groups.py	2010-09-28 15:50:05 +0000
+++ cronscripts/process-job-source-groups.py	2010-09-30 20:33:49 +0000
@@ -47,6 +47,13 @@
             '-e', '--exclude', dest='excluded_job_sources',
             metavar="JOB_SOURCE", default=[], action='append',
             help="Exclude specific job sources.")
+        self.parser.add_option(
+            '--wait', dest='do_wait', default=False, action='store_true',
+            help="Wait for the child processes to finish. This is useful "
+                 "for testing, but it shouldn't be used in a cronjob, since "
+                 "it would prevent the cronjob from processing new jobs "
+                 "if just one of the child processes is still processing, "
+                 "and each process only handles a single job source class.")

     def main(self):
         selected_groups = self.args
@@ -61,8 +68,8 @@
         # Then, exclude job sources.
         for source in self.options.excluded_job_sources:
             if source not in selected_job_sources:
-                self.logger.warn('%r is not in job source groups %s'
-                                 % (source, self.options.groups))
+                self.logger.info('%r is not in job source groups %s'
+                                  % (source, self.options.groups))
             else:
                 selected_job_sources.remove(source)
         # Process job sources.
@@ -75,8 +82,9 @@
         for job_source in selected_job_sources:
             child = subprocess.Popen(child_args + [job_source])
             children.append(child)
-        for child in children:
-            child.wait()
+        if self.options.do_wait:
+            for child in children:
+                child.wait()

     @cachedproperty
     def all_job_sources(self):

=== modified file 'cronscripts/process-job-source.py'
--- cronscripts/process-job-source.py	2010-09-28 15:50:05 +0000
+++ cronscripts/process-job-source.py	2010-09-30 20:34:27 +0000
@@ -7,7 +7,6 @@

 __metaclass__ = type

-from optparse import OptionParser
 import sys

 import _pythonpath
@@ -15,30 +14,37 @@

 from canonical.config import config
 from lp.services.job import runner
-from lp.services.job.runner import (
-    JobCronScript,
-    JobRunner,
-    )
+from lp.services.job.runner import JobCronScript


 class ProcessJobSource(JobCronScript):
-    """Run jobs."""
-
-    def __init__(self, job_source):
+    """Run jobs for a specified job source class."""
+    usage = (
+        "Usage: %prog [options] JOB_SOURCE\n\n"
+        "For more help, run:\n"
+        "    cronscripts/process-job-source-groups.py --help")
+
+    def configure(self):
+        """Override configs main() is called by run().
+
+        It is done here instead of __init__(), so that we get to use its
+        option parser.
+        """
+        if len(self.args) != 1:
+            self.parser.print_help()
+            sys.exit(1)
+        job_source = self.args[0]
         # The dbuser is grabbed from the section matching config_name.
-        self.config_name = job_source
-        section = getattr(config, self.config_name)
+        section = getattr(config, job_source)
         # The fromlist argument is necessary so that __import__()
         # returns the bottom submodule instead of the top one.
         module = __import__(section.module, fromlist=[job_source])
         self.source_interface = getattr(module, job_source)
-        if getattr(section, 'runner_class', None) is None:
-            runner_class = JobRunner
-        else:
-            runner_class = getattr(runner, section.runner_class, JobRunner)
-        super(ProcessJobSource, self).__init__(
-            runner_class=runner_class,
-            script_name='process-job-source-%s' % job_source)
+        runner_class_name = getattr(section, 'runner_class', 'JobRunner')
+        # Override attributes that are normally set in __init__().
+        self.name = 'process-job-source-%s' % job_source
+        self.config_name = job_source
+        self.runner_class = getattr(runner, runner_class_name)

     def main(self):
         if self.options.verbose:
@@ -46,21 +52,7 @@
         super(ProcessJobSource, self).main()


-class NoErrorOptionParser(OptionParser):
-    """Allow any options that will be later handled by ProcessJobSource."""
-
-    def error(self, *args, **kw):
-        pass
-
-
 if __name__ == '__main__':
-    options, args = NoErrorOptionParser().parse_args()
-    if len(args) != 1:
-        print "Usage: %s [options] JOB_SOURCE" % sys.argv[0]
-        print
-        print "For help, run:"
-        print "    cronscripts/process-job-source-groups.py --help"
-        sys.exit()
-    job_source = args[0]
-    script = ProcessJobSource(job_source)
+    script = ProcessJobSource()
+    script.configure()
     script.lock_and_run()

=== modified file 'lib/canonical/launchpad/scripts/tests/__init__.py'
--- lib/canonical/launchpad/scripts/tests/__init__.py	2009-06-25 05:39:50 +0000
+++ lib/canonical/launchpad/scripts/tests/__init__.py	2010-09-30 16:57:22 +0000
@@ -31,5 +31,5 @@
         args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = process.communicate()
     if process.returncode != expect_returncode:
-        raise AssertionError('Failed:\n%s' % stderr)
+        raise AssertionError('Failed:\n%s\n%s' % (stdout, stderr))
     return (process.returncode, stdout, stderr)

=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
--- lib/lp/code/interfaces/branchmergeproposal.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/interfaces/branchmergeproposal.py	2010-09-30 21:06:37 +0000
@@ -85,6 +85,7 @@
     IJob,
     IJobSource,
     IRunnableJob,
+    ITwistedJobSource,
     )


@@ -544,7 +545,7 @@
         """Destroy this object."""


-class IBranchMergeProposalJobSource(IJobSource):
+class IBranchMergeProposalJobSource(ITwistedJobSource):
     """A job source that will get all supported merge proposal jobs."""



=== modified file 'lib/lp/registry/interfaces/persontransferjob.py'
--- lib/lp/registry/interfaces/persontransferjob.py	2010-09-17 22:24:15 +0000
+++ lib/lp/registry/interfaces/persontransferjob.py	2010-09-30 20:23:44 +0000
@@ -61,6 +61,16 @@
 class IMembershipNotificationJob(IPersonTransferJob):
     """A Job to notify new members of a team of that change."""

+    member = PublicPersonChoice(
+        title=_('Alias for minor_person attribute'),
+        vocabulary='ValidPersonOrTeam',
+        required=True)
+
+    team = PublicPersonChoice(
+        title=_('Alias for major_person attribute'),
+        vocabulary='ValidPersonOrTeam',
+        required=True)
+

 class IMembershipNotificationJobSource(IJobSource):
     """An interface for acquiring IMembershipNotificationJobs."""

=== modified file 'lib/lp/registry/model/persontransferjob.py'
--- lib/lp/registry/model/persontransferjob.py	2010-09-24 05:02:37 +0000
+++ lib/lp/registry/model/persontransferjob.py	2010-09-30 20:59:41 +0000
@@ -167,16 +167,6 @@
             ])
         return vars

-    @classmethod
-    def get(cls, id):
-        """Return the instance of this class whose id is supplied."""
-        store = IMasterStore(PersonTransferJob)
-        instance = store.get(PersonTransferJob, id)
-        if instance is None:
-            raise SQLObjectNotFound(
-                'No occurrence of PersonTransferJob with id %s' % id)
-        return cls(instance)
-

 class MembershipNotificationJob(PersonTransferJobDerived):
     """A Job that sends notifications about team membership changes."""

=== modified file
'lib/lp/registry/tests/test_membership_notification_job_creation.py'
--- lib/lp/registry/tests/test_membership_notification_job_creation.py	2010-09-28
15:50:05 +0000
+++ lib/lp/registry/tests/test_membership_notification_job_creation.py	2010-09-30
21:30:15 +0000
@@ -5,7 +5,6 @@

 __metaclass__ = type

-import transaction
 from zope.component import getUtility

 from canonical.testing import LaunchpadFunctionalLayer
@@ -17,11 +16,13 @@
     ITeamMembershipSet,
     TeamMembershipStatus,
     )
+from lp.registry.model.persontransferjob import MembershipNotificationJob
+from lp.services.job.interfaces.job import JobStatus
 from lp.testing import (
-    login,
     login_person,
     TestCaseWithFactory,
     )
+from lp.testing.sampledata import ADMIN_EMAIL


 class CreateMembershipNotificationJobTest(TestCaseWithFactory):
@@ -40,21 +41,25 @@
         membership_set = getUtility(ITeamMembershipSet)
         tm = membership_set.getByPersonAndTeam(self.person, self.team)
         tm.setStatus(TeamMembershipStatus.ADMIN, self.team.teamowner)
-        transaction.commit()
         jobs = list(self.job_source.iterReady())
+        job_info = [
+            (job.__class__, job.member, job.team, job.status)
+            for job in jobs]
         self.assertEqual(
-            ('[<MEMBERSHIP_NOTIFICATION branch job (1) '
-             'for murdock as part of a-team. status=Waiting>]'),
-            str(jobs))
+            [(MembershipNotificationJob,
+              self.person,
+              self.team,
+              JobStatus.WAITING),
+            ],
+            job_info)

     def test_setstatus_silent(self):
-        login('<email address hidden>')
         person_set = getUtility(IPersonSet)
-        admin = person_set.getByEmail('<email address hidden>')
+        admin = person_set.getByEmail(ADMIN_EMAIL)
+        login_person(admin)
         self.team.addMember(self.person, self.team.teamowner)
         membership_set = getUtility(ITeamMembershipSet)
         tm = membership_set.getByPersonAndTeam(self.person, self.team)
         tm.setStatus(
             TeamMembershipStatus.ADMIN, admin, silent=True)
-        transaction.commit()
         self.assertEqual([], list(self.job_source.iterReady()))

=== modified file 'lib/lp/registry/tests/test_process_job_sources_cronjob.py'
--- lib/lp/registry/tests/test_process_job_sources_cronjob.py	2010-09-28
15:50:05 +0000
+++ lib/lp/registry/tests/test_process_job_sources_cronjob.py	2010-09-30
21:17:39 +0000
@@ -12,7 +12,8 @@
 from zope.component import getUtility

 from canonical.config import config
-from canonical.testing import LaunchpadFunctionalLayer
+from canonical.launchpad.scripts.tests import run_script
+from canonical.testing import LaunchpadScriptLayer
 from lp.registry.interfaces.teammembership import (
     ITeamMembershipSet,
     TeamMembershipStatus,
@@ -25,32 +26,33 @@

 class ProcessJobSourceTest(TestCaseWithFactory):
     """Test the process-job-source.py script."""
-    layer = LaunchpadFunctionalLayer
+    layer = LaunchpadScriptLayer
+    script = 'cronscripts/process-job-source.py'

-    def _run(self, *args):
-        script = os.path.join(
-            config.root, 'cronscripts', 'process-job-source.py')
-        cmd = [script] + list(args)
-        process = subprocess.Popen(
-            cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT)
-        (stdout, empty_stderr) = process.communicate()
-        return stdout
+    def tearDown(self):
+        super(ProcessJobSourceTest, self).tearDown()
+        self.layer.force_dirty_database()

     def test_missing_argument(self):
-        output = self._run()
+        # The script should display usage info when called without any
+        # arguments.
+        returncode, output, error = run_script(
+            self.script, [], expect_returncode=1)
         self.assertIn('Usage:', output)
         self.assertIn('process-job-source.py [options] JOB_SOURCE', output)

     def test_empty_queue(self):
-        output = self._run('IMembershipNotificationJobSource')
+        # The script should just create a lockfile and exit if no jobs
+        # are in the queue.
+        returncode, output, error = run_script(
+            self.script, ['IMembershipNotificationJobSource'])
         expected = (
-            'INFO    Creating lockfile: /var/lock/launchpad-process-job-'
-            'source-IMembershipNotificationJobSource.lock\n'
-            'INFO    Running synchronously.\n')
-        self.assertEqual(expected, output)
+            'INFO    Creating lockfile: .*launchpad-process-job-'
+            'source-IMembershipNotificationJobSource.lock.*')
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, error)

     def test_processed(self):
+        # The script should output the number of jobs it processed.
         person = self.factory.makePerson(name='murdock')
         team = self.factory.makeTeam(name='a-team')
         login_person(team.teamowner)
@@ -59,31 +61,30 @@
         tm = membership_set.getByPersonAndTeam(person, team)
         tm.setStatus(TeamMembershipStatus.ADMIN, team.teamowner)
         transaction.commit()
-        output = self._run('-v', 'IMembershipNotificationJobSource')
+        returncode, output, error = run_script(
+            self.script, ['-v', 'IMembershipNotificationJobSource'])
         self.assertIn(
             ('DEBUG   Running <MEMBERSHIP_NOTIFICATION branch job (1) '
              'for murdock as part of a-team. status=Waiting>'),
-            output)
-        self.assertIn('DEBUG   MembershipNotificationJob sent email', output)
-        self.assertIn('Ran 1 MembershipNotificationJob jobs.', output)
+            error)
+        self.assertIn('DEBUG   MembershipNotificationJob sent email', error)
+        self.assertIn('Ran 1 MembershipNotificationJob jobs.', error)


 class ProcessJobSourceGroupsTest(TestCaseWithFactory):
     """Test the process-job-source-groups.py script."""
-    layer = LaunchpadFunctionalLayer
+    layer = LaunchpadScriptLayer
+    script = 'cronscripts/process-job-source-groups.py'

-    def _run(self, *args):
-        script = os.path.join(
-            config.root, 'cronscripts', 'process-job-source-groups.py')
-        cmd = [script] + list(args)
-        process = subprocess.Popen(
-            cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT)
-        (stdout, empty_stderr) = process.communicate()
-        return stdout
+    def tearDown(self):
+        super(ProcessJobSourceGroupsTest, self).tearDown()
+        self.layer.force_dirty_database()

     def test_missing_argument(self):
-        output = self._run()
+        # The script should display usage info when called without any
+        # arguments.
+        returncode, output, error = run_script(
+            self.script, [], expect_returncode=1)
         self.assertIn(
             ('Usage: process-job-source-groups.py '
              '[ -e JOB_SOURCE ] GROUP [GROUP]...'),
@@ -94,16 +95,18 @@
                       output)

     def test_empty_queue(self):
-        output = self._run('MAIN')
+        # The script should just create a lockfile, launch a child for
+        # each job source class, and then exit if no jobs are in the queue.
+        returncode, output, error = run_script(self.script, ['MAIN'])
         expected = (
-            'INFO    Creating lockfile: /var/lock/launchpad-'
-            'processjobsourcegroups.lock\n'
-            'INFO    Creating lockfile: /var/lock/launchpad-process-job-'
-            'source-IMembershipNotificationJobSource.lock\n'
-            'INFO    Running synchronously.\n')
-        self.assertEqual(expected, output)
+            '.*Creating lockfile:.*launchpad-processjobsourcegroups.lock'
+            '.*Creating lockfile:.*launchpad-process-job-'
+            'source-IMembershipNotificationJobSource.lock.*')
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, error)

     def test_processed(self):
+        # The script should output the number of jobs that have been
+        # processed by its child processes.
         person = self.factory.makePerson(name='murdock')
         team = self.factory.makeTeam(name='a-team')
         login_person(team.teamowner)
@@ -112,10 +115,11 @@
         tm = membership_set.getByPersonAndTeam(person, team)
         tm.setStatus(TeamMembershipStatus.ADMIN, team.teamowner)
         transaction.commit()
-        output = self._run('-v', 'MAIN')
-        self.assertIn(
-            ('DEBUG   Running <MEMBERSHIP_NOTIFICATION branch job (1) '
+        returncode, output, error = run_script(
+            self.script, ['-v', '--wait', 'MAIN'])
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            ('DEBUG Running <MEMBERSHIP_NOTIFICATION branch job (.*) '
              'for murdock as part of a-team. status=Waiting>'),
-            output)
-        self.assertIn('DEBUG   MembershipNotificationJob sent email', output)
-        self.assertIn('Ran 1 MembershipNotificationJob jobs.', output)
+            error)
+        self.assertIn('DEBUG   MembershipNotificationJob sent email', error)
+        self.assertIn('Ran 1 MembershipNotificationJob jobs.', error)

=== modified file 'lib/lp/services/job/interfaces/job.py'
--- lib/lp/services/job/interfaces/job.py	2010-09-28 15:07:47 +0000
+++ lib/lp/services/job/interfaces/job.py	2010-09-30 21:03:25 +0000
@@ -11,6 +11,7 @@
     'IJob',
     'IJobSource',
     'IRunnableJob',
+    'ITwistedJobSource',
     'JobStatus',
     'LeaseHeld',
     ]
@@ -167,8 +168,9 @@
     def contextManager():
         """Get a context for running this kind of job in."""

+
+class ITwistedJobSource(IJobSource):
+    """Interface for a job source that is usable by the TwistedJobRunner."""
+
     def get(id):
-        """Get a job by its id.
-
-        This is currently only needed by the TwistedJobRunner.
-        """
+        """Get a job by its id."""

=== modified file 'lib/lp/services/job/runner.py'
--- lib/lp/services/job/runner.py	2010-09-28 17:30:38 +0000
+++ lib/lp/services/job/runner.py	2010-09-30 21:25:51 +0000
@@ -340,11 +340,9 @@

     def __init__(self, job_source, dbuser, logger=None, error_utility=None):
         env = {'PATH': os.environ['PATH']}
-        if 'PYTHONPATH' in os.environ:
-            env['PYTHONPATH'] = os.environ['PYTHONPATH']
-        lp_config = os.environ.get('LPCONFIG')
-        if lp_config is not None:
-            env['LPCONFIG'] = lp_config
+        for name in ('PYTHONPATH', 'LPCONFIG'):
+            if name in os.environ:
+                env[name] = os.environ[name]
         starter = main.ProcessStarter(
             packages=('_pythonpath', 'twisted', 'ampoule'), env=env)
         super(TwistedJobRunner, self).__init__(logger, error_utility)
@@ -446,13 +444,17 @@
 class JobCronScript(LaunchpadCronScript):
     """Base class for scripts that run jobs."""

+    config_name = None
+
     def __init__(self, runner_class=JobRunner, test_args=None,
                  script_name=None):
-        self.dbuser = getattr(config, self.config_name).dbuser
         if script_name is None:
             script_name = self.config_name
+        # The dbuser is set in run(), since the config_name might not
+        # be set until the command-line arguments can be processed using
+        # the OptionParser set up by LaunchpadScript.__init__().
         super(JobCronScript, self).__init__(
-            script_name, self.dbuser, test_args)
+            script_name, None, test_args)
         self.runner_class = runner_class

     def job_counts(self, jobs):
@@ -462,6 +464,12 @@
             counts[job.__class__.__name__] += 1
         return sorted(counts.items())

+    def run(self, use_web_security=False, implicit_begin=True,
+            isolation=None):
+        self.dbuser = getattr(config, self.config_name).dbuser
+        super(JobCronScript, self).run(
+            use_web_security, implicit_begin, isolation)
+
     def main(self):
         section = config[self.config_name]
         if (getattr(section, 'error_dir', None) is not None

=== modified file 'lib/lp/services/scripts/base.py'
--- lib/lp/services/scripts/base.py	2010-08-20 20:31:18 +0000
+++ lib/lp/services/scripts/base.py	2010-09-30 20:03:07 +0000
@@ -140,8 +140,6 @@
         self.options, self.args = self.parser.parse_args(args=test_args)
         self.logger = scripts.logger(self.options, name)

-        self.lockfilepath = os.path.join(LOCK_PATH, self.lockfilename)
-
     #
     # Hooks that we expect users to redefine.
     #
@@ -189,6 +187,10 @@
         """
         return "launchpad-%s.lock" % self.name

+    @property
+    def lockfilepath(self):
+        return os.path.join(LOCK_PATH, self.lockfilename)
+
     def setup_lock(self):
         """Create lockfile.

@@ -234,8 +236,10 @@
         self.lock.release(skip_delete=skip_delete)

     def run(self, use_web_security=False, implicit_begin=True,
-            isolation=ISOLATION_LEVEL_DEFAULT):
+            isolation=None):
         """Actually run the script, executing zcml and initZopeless."""
+        if isolation is None:
+            isolation = ISOLATION_LEVEL_DEFAULT
         self._init_zca(use_web_security=use_web_security)
         self._init_db(implicit_begin=implicit_begin, isolation=isolation)

@@ -297,8 +301,9 @@
 class LaunchpadCronScript(LaunchpadScript):
     """Logs successful script runs in the database."""

-    def __init__(self, name=None, dbuser=None, test_args=None):
-        """Initialize, and sys.exit() if the cronscript is disabled.
+    def run(self, use_web_security=False, implicit_begin=True,
+            isolation=None):
+        """Run if the cronscript is not disabled by the control file.

         Rather than hand editing crontab files, cronscripts can be
         enabled and disabled using a config file.
@@ -306,12 +311,12 @@
         The control file location is specified by
         config.canonical.cron_control_file.
         """
-        super(LaunchpadCronScript, self).__init__(name, dbuser, test_args)
-
         enabled = cronscript_enabled(
             config.canonical.cron_control_file, self.name, self.logger)
         if not enabled:
             sys.exit(0)
+        super(LaunchpadCronScript, self).run(
+            use_web_security, implicit_begin, isolation)

     def record_activity(self, date_started, date_completed):
         """Record the successful completion of the script."""

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-09-03 03:12:39 +0000
+++ lib/lp/testing/__init__.py	2010-09-30 20:47:40 +0000
@@ -546,6 +546,16 @@
         self.direct_database_server = False
         self._use_bzr_branch_called = False

+    def assertTextMatchesExpressionIgnoreWhitespace(self,
+                                                    regular_expression_txt,
+                                                    text):
+        def normalise_whitespace(text):
+            return ' '.join(text.split())
+        pattern = re.compile(
+            normalise_whitespace(regular_expression_txt), re.S)
+        self.assertIsNot(
+            None, pattern.search(normalise_whitespace(text)), text)
+
     def getUserBrowser(self, url=None, user=None, password='test'):
         """Return a Browser logged in as a fresh user, maybe opened at `url`.

@@ -677,16 +687,6 @@
         super(BrowserTestCase, self).setUp()
         self.user = self.factory.makePerson(password='test')

-    def assertTextMatchesExpressionIgnoreWhitespace(self,
-                                                    regular_expression_txt,
-                                                    text):
-        def normalise_whitespace(text):
-            return ' '.join(text.split())
-        pattern = re.compile(
-            normalise_whitespace(regular_expression_txt), re.S)
-        self.assertIsNot(
-            None, pattern.search(normalise_whitespace(text)), text)
-
     def getViewBrowser(self, context, view_name=None):
         login(ANONYMOUS)
         url = canonical_url(context, view_name=view_name)