Merge lp:~gmb/launchpad/blobjob-cronscript-bug-513190 into lp:launchpad/db-devel

[Graham Binns]

Add a cronscript for running ProcessApportBlobJobs.

[Graham Binns (gmb)]

This branch adds a cronscript to run ProcessApportBlob jobs. These jobs are created when a new Apport BLOB is uploaded. The idea is that the processing of large BLOBs should be done outside the request, so that +filebug will no longer time out due to the size of uploaded data.

== configs/development/launchpad-lazr.conf ==

 - I've added an error_dir directive for the process_apport_blobs
   script.

== configs/testrunner/launchpad-lazr.conf ==

 - I've added error_dir and oops_prefix directives for the
   process_apport_blobs script.

== cronscripts/process-apport-blobs.py ==

 - I've created a new cronscript based on JobCronScript to run the
   ProcessApportBlob jobs.

== database/schema/security.cfg ==

 - I've added the necessary permissions for the script's db user.

== lib/canonical/config/schema-lazr.conf ==

 - I've added basic config options for the script.

== lib/canonical/launchpad/browser/temporaryblobstorage.py ==

 - I've updated the TemporaryBlobStorageAddView to ensure that errors
   are handled properly if the librarian isn't available for some
   reason.

== lib/lp/bugs/tests/test_apportjob.py ==

 - I've added a test to ensure that the cronscript runs.

No lint.

[Graham Binns (gmb)]

Non-crazy diff:

=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf 2010-01-22 04:01:17 +0000
+++ configs/development/launchpad-lazr.conf 2010-02-12 15:44:24 +0000
@@ -221,6 +221,9 @@
 error_dir: /var/tmp/poimport
 oops_prefix: POI

+[process_apport_blobs]
+error_dir: /var/tmp/lperr
+
 [supermirror_puller]
 error_dir: /var/tmp/codehosting.test
 oops_prefix: SMP

=== modified file 'configs/testrunner/launchpad-lazr.conf'
--- configs/testrunner/launchpad-lazr.conf 2010-01-29 17:15:31 +0000
+++ configs/testrunner/launchpad-lazr.conf 2010-02-12 15:44:24 +0000
@@ -193,6 +193,11 @@
 error_dir: /var/tmp/poimport.test
 oops_prefix: TPOI

+[process_apport_blobs]
+dbuser: process-apport-blobs
+oops_prefix: TAPPORTBLOB
+error_dir: /var/tmp/lperr.test
+
 [rosettabranches]
 oops_prefix: TRSBR
 error_dir: /var/tmp/rosettabranches.test

=== added file 'cronscripts/process-apport-blobs.py'
--- cronscripts/process-apport-blobs.py 1970-01-01 00:00:00 +0000
+++ cronscripts/process-apport-blobs.py 2010-02-11 18:50:58 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/python2.5
+#
+# Copyright 2010 Canonical Ltd. This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=W0403
+
+"""Process uploaded Apport BLOBs."""
+
+__metaclass__ = type
+
+import _pythonpath
+
+from canonical.launchpad.webapp import errorlog
+
+from lp.services.job.runner import JobCronScript
+from lp.bugs.interfaces.apportjob import IProcessApportBlobJobSource
+
+
+class RunProcessApportBlobs(JobCronScript):
+ """Run ProcessApportBlobJobs."""
+
+ config_name = 'process_apport_blobs'
+ source_interface = IProcessApportBlobJobSource
+
+ def main(self):
+ errorlog.globalErrorUtility.configure(self.config_name)
+ return super(RunProcessApportBlobs, self).main()
+
+
+if __name__ == '__main__':
+ script = RunProcessApportBlobs()
+ script.lock_and_run()

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg 2010-02-02 11:58:46 +0000
+++ database/schema/security.cfg 2010-02-12 15:44:24 +0000
@@ -1897,3 +1897,11 @@
 public.bug = SELECT, UPDATE
 public.job = SELECT, UPDATE, DELETE
 public.bugjob = SELECT, DELETE
+
+[process-apport-blobs]
+type=user
+groups=script,read
+public.job = SELECT, UPDATE, DELETE
+public.apportjob = SELECT, INSERT, UPDATE, DELETE
+public.libraryfilealias = SELECT, INSERT, UPDATE
+public.libraryfilecontent = SELECT, INSERT, UPDATE

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf 2010-01-22 04:01:17 +0000
+++ lib/canonical/config/schema-lazr.conf 2010-02-12 15:44:24 +0000
@@ -28,7 +28,6 @@
 # datatype: string
 base_url: http://ftpmaster.internal/

-
 [calculate_bug_heat]
 # The database user which will be used by this process.
 # datatype: string
@@ -37,6 +36,13 @@
 error_dir: none
 copy_to_zlog: false

+[process_apport_blobs]
+# The database user which will be used by this process.
+# datatype...

[Abel Deuring (adeuring)]

Hi Graham,

anice branch. But please remove the "import pdb; pdb.set_trace()" from temporaryblobstorage.py ;)

review: Approve (code)

=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf	2010-01-22 04:01:17 +0000
+++ configs/development/launchpad-lazr.conf	2010-02-12 16:13:42 +0000
@@ -221,6 +221,9 @@
 error_dir: /var/tmp/poimport
 oops_prefix: POI
 
+[process_apport_blobs]
+error_dir: /var/tmp/lperr
+
 [supermirror_puller]
 error_dir: /var/tmp/codehosting.test
 oops_prefix: SMP

=== modified file 'configs/testrunner/launchpad-lazr.conf'
--- configs/testrunner/launchpad-lazr.conf	2010-01-29 17:15:31 +0000
+++ configs/testrunner/launchpad-lazr.conf	2010-02-12 16:13:42 +0000
@@ -193,6 +193,11 @@
 error_dir: /var/tmp/poimport.test
 oops_prefix: TPOI
 
+[process_apport_blobs]
+dbuser: process-apport-blobs
+oops_prefix: TAPPORTBLOB
+error_dir: /var/tmp/lperr.test
+
 [rosettabranches]
 oops_prefix: TRSBR
 error_dir: /var/tmp/rosettabranches.test

=== added file 'cronscripts/process-apport-blobs.py'
--- cronscripts/process-apport-blobs.py	1970-01-01 00:00:00 +0000
+++ cronscripts/process-apport-blobs.py	2010-02-12 16:13:41 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/python2.5
+#
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=W0403
+
+"""Process uploaded Apport BLOBs."""
+
+__metaclass__ = type
+
+import _pythonpath
+
+from canonical.launchpad.webapp import errorlog
+
+from lp.services.job.runner import JobCronScript
+from lp.bugs.interfaces.apportjob import IProcessApportBlobJobSource
+
+
+class RunProcessApportBlobs(JobCronScript):
+    """Run ProcessApportBlobJobs."""
+
+    config_name = 'process_apport_blobs'
+    source_interface = IProcessApportBlobJobSource
+
+    def main(self):
+        errorlog.globalErrorUtility.configure(self.config_name)
+        return super(RunProcessApportBlobs, self).main()
+
+
+if __name__ == '__main__':
+    script = RunProcessApportBlobs()
+    script.lock_and_run()

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-02-02 11:58:46 +0000
+++ database/schema/security.cfg	2010-02-12 16:13:41 +0000
@@ -1897,3 +1897,11 @@
 public.bug                              = SELECT, UPDATE
 public.job                              = SELECT, UPDATE, DELETE
 public.bugjob                           = SELECT, DELETE
+
+[process-apport-blobs]
+type=user
+groups=script,read
+public.job                              = SELECT, UPDATE, DELETE
+public.apportjob                        = SELECT, INSERT, UPDATE, DELETE
+public.libraryfilealias                 = SELECT, INSERT, UPDATE
+public.libraryfilecontent               = SELECT, INSERT, UPDATE

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2010-01-22 04:01:17 +0000
+++ lib/canonical/config/schema-lazr.conf	2010-02-12 16:13:41 +0000
@@ -28,7 +28,6 @@
 # datatype: string
 base_url: http://ftpmaster.internal/
 
-
 [calculate_bug_heat]
 # The database user which will be used by this process.
 # datatype: string
@@ -37,6 +36,13 @@
 error_dir: none
 copy_to_zlog: false
 
+[process_apport_blobs]
+# The database user which will be used by this process.
+# datatype: string
+dbuser: process-apport-blobs
+oops_prefix: APPORTBLOB
+error_dir: none
+copy_to_zlog: false
 
 [branchscanner]
 # The database user which will be used by this process.

=== modified file 'lib/canonical/launchpad/browser/temporaryblobstorage.py'
--- lib/canonical/launchpad/browser/temporaryblobstorage.py	2010-02-10 14:17:10 +0000
+++ lib/canonical/launchpad/browser/temporaryblobstorage.py	2010-02-12 16:13:41 +0000
@@ -42,6 +42,7 @@
     # being named like that.
     @action('Continue', name='FORM_SUBMIT')
     def continue_action(self, action, data):
+<<<<<<< TREE
         uuid = self.store_blob(data['blob'])
         self.request.response.setHeader('X-Launchpad-Blob-Token', uuid)
         self.request.response.addInfoNotification(
@@ -51,12 +52,35 @@
         """Store a blob and return its UUID."""
         try:
             uuid = getUtility(ITemporaryStorageManager).new(blob)
+=======
+        uuid = self.store_blob(data['blob'])
+        if uuid is not None:
+            self.request.response.setHeader('X-Launchpad-Blob-Token', uuid)
+            self.request.response.addInfoNotification(
+                'Your ticket is "%s"' % uuid)
+
+    def store_blob(self, blob):
+        """Store a blob and return its UUID."""
+        try:
+            uuid = getUtility(ITemporaryStorageManager).new(blob)
+>>>>>>> MERGE-SOURCE
         except BlobTooLarge:
             self.addError('Uploaded file was too large.')
-        except UploadFailed:
+            return None
+        except UploadFailed, e:
+            import pdb; pdb.set_trace()
             self.addError('File storage unavailable - try again later.')
+<<<<<<< TREE
 
         # Create ProcessApportBlobJob for the BLOB.
         blob = getUtility(ITemporaryStorageManager).fetch(uuid)
         getUtility(IProcessApportBlobJobSource).create(blob)
         return uuid
+=======
+            return None
+        else:
+            # Create ProcessApportBlobJob for the BLOB.
+            blob = getUtility(ITemporaryStorageManager).fetch(uuid)
+            getUtility(IProcessApportBlobJobSource).create(blob)
+            return uuid
+>>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/bugs/tests/test_apportjob.py'
--- lib/lp/bugs/tests/test_apportjob.py	2010-02-11 10:59:08 +0000
+++ lib/lp/bugs/tests/test_apportjob.py	2010-02-12 16:13:42 +0000
@@ -13,11 +13,20 @@
 
 from canonical.config import config
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
-from canonical.launchpad.interfaces.temporaryblobstorage import (
-    ITemporaryStorageManager)
-from canonical.launchpad.webapp.interfaces import ILaunchpadRoot
-from canonical.testing import (
-    LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
+<<<<<<< TREE
+from canonical.launchpad.interfaces.temporaryblobstorage import (
+    ITemporaryStorageManager)
+from canonical.launchpad.webapp.interfaces import ILaunchpadRoot
+from canonical.testing import (
+    LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
+=======
+from canonical.launchpad.interfaces.temporaryblobstorage import (
+    ITemporaryStorageManager)
+from canonical.launchpad.webapp.interfaces import ILaunchpadRoot
+from canonical.launchpad.scripts.tests import run_script
+from canonical.testing import (
+    LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
+>>>>>>> MERGE-SOURCE
 
 from lp.bugs.interfaces.apportjob import ApportJobType
 from lp.bugs.model.apportjob import (
@@ -162,104 +171,218 @@
                 "LibrarianFileAlias %s" % (
                     attachment['filename'], file_alias.id))
 
-    def test_getByBlobUUID(self):
-        # ProcessApportBlobJob.getByBlobUUID takes a BLOB UUID as a
-        # parameter and returns any jobs for that BLOB.
-        uuid = self.blob.uuid
-
-        job = ProcessApportBlobJob.create(self.blob)
-        job_from_uuid = ProcessApportBlobJob.getByBlobUUID(uuid)
-        self.assertEqual(
-            job, job_from_uuid,
-            "Job returend by getByBlobUUID() did not match original job.")
-        self.assertEqual(
-            self.blob, job_from_uuid.blob,
-            "BLOB referenced by Job returned by getByBlobUUID() did not "
-            "match original BLOB.")
-
-    def test_create_job_creates_only_one(self):
-        # ProcessApportBlobJob.create() will create only one
-        # ProcessApportBlobJob for a given BLOB, no matter how many
-        # times it is called.
-        current_jobs = list(ProcessApportBlobJob.iterReady())
-        self.assertEqual(
-            0, len(current_jobs),
-            "There should be no ProcessApportBlobJobs. Found %s" %
-            len(current_jobs))
-
-        job = ProcessApportBlobJob.create(self.blob)
-        current_jobs = list(ProcessApportBlobJob.iterReady())
-        self.assertEqual(
-            1, len(current_jobs),
-            "There should be only one ProcessApportBlobJob. Found %s" %
-            len(current_jobs))
-
-        another_job = ProcessApportBlobJob.create(self.blob)
-        current_jobs = list(ProcessApportBlobJob.iterReady())
-        self.assertEqual(
-            1, len(current_jobs),
-            "There should be only one ProcessApportBlobJob. Found %s" %
-            len(current_jobs))
-
-        # If the job is complete, it will no longer show up in the list
-        # of ready jobs. However, it won't be possible to create a new
-        # job to process the BLOB because each BLOB can only have one
-        # ProcessApportBlobJob.
-        job.job.start()
-        job.job.complete()
-        current_jobs = list(ProcessApportBlobJob.iterReady())
-        self.assertEqual(
-            0, len(current_jobs),
-            "There should be no ready ProcessApportBlobJobs. Found %s" %
-            len(current_jobs))
-
-        yet_another_job = ProcessApportBlobJob.create(self.blob)
-        current_jobs = list(ProcessApportBlobJob.iterReady())
-        self.assertEqual(
-            0, len(current_jobs),
-            "There should be no new ProcessApportBlobJobs. Found %s" %
-            len(current_jobs))
-
-        # In fact, yet_another_job will be the same job as before, since
-        # it's attached to the same BLOB.
-        self.assertEqual(job.id, yet_another_job.id, "Jobs do not match.")
-
-
-class TestTemporaryBlobStorageAddView(TestCaseWithFactory):
-    """Test case for the TemporaryBlobStorageAddView."""
-
-    layer = LaunchpadFunctionalLayer
-
-    def setUp(self):
-        super(TestTemporaryBlobStorageAddView, self).setUp()
-
-        # Create a BLOB using existing testing data.
-        testfiles = os.path.join(config.root, 'lib/lp/bugs/tests/testfiles')
-        blob_file = open(
-            os.path.join(testfiles, 'extra_filebug_data.msg'))
-        self.blob_data = blob_file.read()
-        blob_file.close()
-
-    def test_adding_blob_adds_job(self):
-        # Using the TemporaryBlobStorageAddView to upload a new BLOB
-        # will add a new ProcessApportBlobJob for that BLOB.
-        view = create_initialized_view(
-            getUtility(ILaunchpadRoot), '+storeblob')
-
-        # The view's store_blob method stores the blob in the database
-        # and returns its UUID.
-        blob_uuid = view.store_blob(self.blob_data)
-        transaction.commit()
-
-        # A new ProcessApportBlobJob will have been created for the
-        # BLOB.
-        blob = getUtility(ITemporaryStorageManager).fetch(blob_uuid)
-        job = ProcessApportBlobJob.getByBlobUUID(blob_uuid)
-
-        self.assertEqual(
-            blob, job.blob,
-            "BLOB attached to Job returned by getByBlobUUID() did not match "
-            "expected BLOB.")
+<<<<<<< TREE
+    def test_getByBlobUUID(self):
+        # ProcessApportBlobJob.getByBlobUUID takes a BLOB UUID as a
+        # parameter and returns any jobs for that BLOB.
+        uuid = self.blob.uuid
+
+        job = ProcessApportBlobJob.create(self.blob)
+        job_from_uuid = ProcessApportBlobJob.getByBlobUUID(uuid)
+        self.assertEqual(
+            job, job_from_uuid,
+            "Job returend by getByBlobUUID() did not match original job.")
+        self.assertEqual(
+            self.blob, job_from_uuid.blob,
+            "BLOB referenced by Job returned by getByBlobUUID() did not "
+            "match original BLOB.")
+
+    def test_create_job_creates_only_one(self):
+        # ProcessApportBlobJob.create() will create only one
+        # ProcessApportBlobJob for a given BLOB, no matter how many
+        # times it is called.
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            0, len(current_jobs),
+            "There should be no ProcessApportBlobJobs. Found %s" %
+            len(current_jobs))
+
+        job = ProcessApportBlobJob.create(self.blob)
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            1, len(current_jobs),
+            "There should be only one ProcessApportBlobJob. Found %s" %
+            len(current_jobs))
+
+        another_job = ProcessApportBlobJob.create(self.blob)
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            1, len(current_jobs),
+            "There should be only one ProcessApportBlobJob. Found %s" %
+            len(current_jobs))
+
+        # If the job is complete, it will no longer show up in the list
+        # of ready jobs. However, it won't be possible to create a new
+        # job to process the BLOB because each BLOB can only have one
+        # ProcessApportBlobJob.
+        job.job.start()
+        job.job.complete()
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            0, len(current_jobs),
+            "There should be no ready ProcessApportBlobJobs. Found %s" %
+            len(current_jobs))
+
+        yet_another_job = ProcessApportBlobJob.create(self.blob)
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            0, len(current_jobs),
+            "There should be no new ProcessApportBlobJobs. Found %s" %
+            len(current_jobs))
+
+        # In fact, yet_another_job will be the same job as before, since
+        # it's attached to the same BLOB.
+        self.assertEqual(job.id, yet_another_job.id, "Jobs do not match.")
+
+
+class TestTemporaryBlobStorageAddView(TestCaseWithFactory):
+    """Test case for the TemporaryBlobStorageAddView."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestTemporaryBlobStorageAddView, self).setUp()
+
+        # Create a BLOB using existing testing data.
+        testfiles = os.path.join(config.root, 'lib/lp/bugs/tests/testfiles')
+        blob_file = open(
+            os.path.join(testfiles, 'extra_filebug_data.msg'))
+        self.blob_data = blob_file.read()
+        blob_file.close()
+
+    def test_adding_blob_adds_job(self):
+        # Using the TemporaryBlobStorageAddView to upload a new BLOB
+        # will add a new ProcessApportBlobJob for that BLOB.
+        view = create_initialized_view(
+            getUtility(ILaunchpadRoot), '+storeblob')
+
+        # The view's store_blob method stores the blob in the database
+        # and returns its UUID.
+        blob_uuid = view.store_blob(self.blob_data)
+        transaction.commit()
+
+        # A new ProcessApportBlobJob will have been created for the
+        # BLOB.
+        blob = getUtility(ITemporaryStorageManager).fetch(blob_uuid)
+        job = ProcessApportBlobJob.getByBlobUUID(blob_uuid)
+
+        self.assertEqual(
+            blob, job.blob,
+            "BLOB attached to Job returned by getByBlobUUID() did not match "
+            "expected BLOB.")
+=======
+    def test_getByBlobUUID(self):
+        # ProcessApportBlobJob.getByBlobUUID takes a BLOB UUID as a
+        # parameter and returns any jobs for that BLOB.
+        uuid = self.blob.uuid
+
+        job = ProcessApportBlobJob.create(self.blob)
+        job_from_uuid = ProcessApportBlobJob.getByBlobUUID(uuid)
+        self.assertEqual(
+            job, job_from_uuid,
+            "Job returend by getByBlobUUID() did not match original job.")
+        self.assertEqual(
+            self.blob, job_from_uuid.blob,
+            "BLOB referenced by Job returned by getByBlobUUID() did not "
+            "match original BLOB.")
+
+    def test_create_job_creates_only_one(self):
+        # ProcessApportBlobJob.create() will create only one
+        # ProcessApportBlobJob for a given BLOB, no matter how many
+        # times it is called.
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            0, len(current_jobs),
+            "There should be no ProcessApportBlobJobs. Found %s" %
+            len(current_jobs))
+
+        job = ProcessApportBlobJob.create(self.blob)
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            1, len(current_jobs),
+            "There should be only one ProcessApportBlobJob. Found %s" %
+            len(current_jobs))
+
+        another_job = ProcessApportBlobJob.create(self.blob)
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            1, len(current_jobs),
+            "There should be only one ProcessApportBlobJob. Found %s" %
+            len(current_jobs))
+
+        # If the job is complete, it will no longer show up in the list
+        # of ready jobs. However, it won't be possible to create a new
+        # job to process the BLOB because each BLOB can only have one
+        # ProcessApportBlobJob.
+        job.job.start()
+        job.job.complete()
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            0, len(current_jobs),
+            "There should be no ready ProcessApportBlobJobs. Found %s" %
+            len(current_jobs))
+
+        yet_another_job = ProcessApportBlobJob.create(self.blob)
+        current_jobs = list(ProcessApportBlobJob.iterReady())
+        self.assertEqual(
+            0, len(current_jobs),
+            "There should be no new ProcessApportBlobJobs. Found %s" %
+            len(current_jobs))
+
+        # In fact, yet_another_job will be the same job as before, since
+        # it's attached to the same BLOB.
+        self.assertEqual(job.id, yet_another_job.id, "Jobs do not match.")
+
+    def test_cronscript_succeeds(self):
+        # The process-apport-blobs cronscript will run all pending
+        # ProcessApportBlobJobs.
+        ProcessApportBlobJob.create(self.blob)
+        transaction.commit()
+
+        retcode, stdout, stderr = run_script(
+            'cronscripts/process-apport-blobs.py', [],
+            expect_returncode=0)
+        self.assertEqual('', stdout)
+        self.assertIn(
+            'INFO    Ran 1 IProcessApportBlobJobSource jobs.\n', stderr)
+
+
+class TestTemporaryBlobStorageAddView(TestCaseWithFactory):
+    """Test case for the TemporaryBlobStorageAddView."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestTemporaryBlobStorageAddView, self).setUp()
+
+        # Create a BLOB using existing testing data.
+        testfiles = os.path.join(config.root, 'lib/lp/bugs/tests/testfiles')
+        blob_file = open(
+            os.path.join(testfiles, 'extra_filebug_data.msg'))
+        self.blob_data = blob_file.read()
+        blob_file.close()
+
+    def test_adding_blob_adds_job(self):
+        # Using the TemporaryBlobStorageAddView to upload a new BLOB
+        # will add a new ProcessApportBlobJob for that BLOB.
+        view = create_initialized_view(
+            getUtility(ILaunchpadRoot), '+storeblob')
+
+        # The view's store_blob method stores the blob in the database
+        # and returns its UUID.
+        blob_uuid = view.store_blob(self.blob_data)
+        transaction.commit()
+
+        # A new ProcessApportBlobJob will have been created for the
+        # BLOB.
+        blob = getUtility(ITemporaryStorageManager).fetch(blob_uuid)
+        job = ProcessApportBlobJob.getByBlobUUID(blob_uuid)
+
+        self.assertEqual(
+            blob, job.blob,
+            "BLOB attached to Job returned by getByBlobUUID() did not match "
+            "expected BLOB.")
+>>>>>>> MERGE-SOURCE
 
 
 def test_suite():

=== modified file 'lib/lp/services/mail/sendmail.py'
--- lib/lp/services/mail/sendmail.py	2010-02-12 09:08:43 +0000
+++ lib/lp/services/mail/sendmail.py	2010-02-12 16:13:42 +0000
@@ -30,6 +30,10 @@
 import sets
 
 from binascii import b2a_qp
+<<<<<<< TREE
+=======
+import sha
+>>>>>>> MERGE-SOURCE
 from email.Encoders import encode_base64
 from email.Utils import getaddresses, make_msgid, formatdate, formataddr
 from email.Message import Message

=== modified file 'lib/lp/soyuz/model/publishing.py'