Merge lp:~james-w/python-oops-celery/serialize-task into lp:python-oops-celery

Proposed by James Westby
Status: Merged
Approved by: James Westby
Approved revision: 10
Merged at revision: 8
Proposed branch: lp:~james-w/python-oops-celery/serialize-task
Merge into: lp:python-oops-celery
Diff against target: 0 lines
To merge this branch: bzr merge lp:~james-w/python-oops-celery/serialize-task
Reviewer Review Type Date Requested Status
Sidnei da Silva (community) Approve
Review via email: mp+95021@code.launchpad.net

Commit message

Ensure that all oops content is bson-encodable.

Description of the change

Hi,

This changes the oopses to be bson-encodable always. If something
gets in that isn't (and it will, as e.g. sender (the task object))
then the oops can't be written out.

I also added two integration tests that show this.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Sidnei da Silva (sidnei) wrote :

Nice. +1!

review: Approve
Revision history for this message
Canonical CA Tarmac (ca-tarmac) wrote :
Download full text (10.3 KiB)

The attempt to merge lp:~james-w/python-oops-celery/serialize-task into lp:python-oops-celery failed. Below is the output from the failed tests.

Downloading/unpacking testtools
  Running setup.py egg_info for package testtools
    warning: no files found matching 'HACKING'
    warning: no files found matching 'MANUAL'
    no previously-included directories found matching 'doc/_build'
Downloading/unpacking fixtures
  Downloading fixtures-0.3.8.tar.gz
  Running setup.py egg_info for package fixtures
Downloading/unpacking oops-datedir-repo
  Downloading oops_datedir_repo-0.0.16.tar.gz
  Running setup.py egg_info for package oops-datedir-repo
Downloading/unpacking bson (from oops-datedir-repo)
  Downloading bson-0.3.3.tar.gz
  Running setup.py egg_info for package bson
Requirement already satisfied (use --upgrade to upgrade): iso8601 in ./virtualenv/lib/python2.6/site-packages/iso8601-0.1.4-py2.6.egg (from oops-datedir-repo)
Downloading/unpacking launchpadlib (from oops-datedir-repo)
  Running setup.py egg_info for package launchpadlib
Requirement already satisfied (use --upgrade to upgrade): oops in ./virtualenv/lib/python2.6/site-packages/oops-0.0.10-py2.6.egg (from oops-datedir-repo)
Requirement already satisfied (use --upgrade to upgrade): pytz in ./virtualenv/lib/python2.6/site-packages/pytz-2011n-py2.6.egg (from oops-datedir-repo)
Downloading/unpacking httplib2 (from launchpadlib->oops-datedir-repo)
  Running setup.py egg_info for package httplib2
Downloading/unpacking keyring (from launchpadlib->oops-datedir-repo)
  Running setup.py egg_info for package keyring
    warning: no previously-included files found matching '.hg/last-message.txt'
Downloading/unpacking lazr.restfulclient>=0.9.19 (from launchpadlib->oops-datedir-repo)
  Running setup.py egg_info for package lazr.restfulclient
Downloading/unpacking lazr.uri (from launchpadlib->oops-datedir-repo)
  Downloading lazr.uri-1.0.3.tar.gz
  Running setup.py egg_info for package lazr.uri
Downloading/unpacking oauth (from launchpadlib->oops-datedir-repo)
  Downloading oauth-1.0.1.tar.gz
  Running setup.py egg_info for package oauth
Requirement already satisfied (use --upgrade to upgrade): distribute in ./virtualenv/lib/python2.6/site-packages/distribute-0.6.10-py2.6.egg (from launchpadlib->oops-datedir-repo)
Downloading/unpacking simplejson (from launchpadlib->oops-datedir-repo)
  Running setup.py egg_info for package simplejson
Downloading/unpacking testresources (from launchpadlib->oops-datedir-repo)
  Downloading testresources-0.2.5.tar.gz
  Running setup.py egg_info for package testresources
Downloading/unpacking wadllib (from launchpadlib->oops-datedir-repo)
  Running setup.py egg_info for package wadllib
Downloading/unpacking lazr.authentication (from lazr.restfulclient>=0.9.19->launchpadlib->oops-datedir-repo)
  Downloading lazr.authentication-0.1.2.tar.gz
  Running setup.py egg_info for package lazr.authentication
Downloading/unpacking wsgi-intercept (from lazr.restfulclient>=0.9.19->launchpadlib->oops-datedir-repo)
  Running setup.py egg_info for package wsgi-intercept
Downloading/unpacking zope.interface (from lazr.authentication->lazr.restfulclient>=0.9.19->launchpadlib->oops-date...

10. By James Westby

Avoid a 2.6 problem where AssertionErrors aren't equal.

Preview Diff

Empty

Subscribers

People subscribed via source and target branches