Launchpad itself

Merge lp://staging/~gary/launchpad/bug838869 into lp://staging/launchpad

bug838869
Merge into devel

Proposed by Gary Poster on 2011-09-01

Status:

Merged

Approved by:

Gary Poster on 2011-09-01

Approved revision:

no longer in the source branch.

Merged at revision:

13857

Proposed branch:

lp://staging/~gary/launchpad/bug838869

Merge into:

lp://staging/launchpad

Diff against target:

613 lines (+439/-41)

4 files modified

lib/canonical/launchpad/webapp/adapter.py (+120/-37)
lib/canonical/launchpad/webapp/tests/test_statementtracer.py (+316/-0)
lib/lp/services/profile/profile.py (+2/-2)
lib/lp/services/profile/tests.py (+1/-2)

To merge this branch:

bzr merge lp://staging/~gary/launchpad/bug838869

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
j.c.sackett (community)		2011-09-01	Approve on 2011-09-01
Review via email: mp+73695@code.staging.launchpad.net

Commit message

[r=jcsackett][bug=838869] Add tests for Launchpad SQL logger; add a more surgical SQL logger for outside of a request than what we had before; and add the ability to conditionally request tracebacks in the SQL logger.

Description of the change

This branch does three things.

- It adds a helper for tracking queries piecemeal in tests and make harness, SQLLogger. This is different than the QueryCollector in lib/lp/testing/_webservice.py because it does not require a browser request to work. I use this in a branch stacked on this one, https://code.launchpad.net/~gary/launchpad/bug811447 , to check queries generated from a piece of model code.

- It adds the ability to conditionally collect stacktraces, and renames the associated function from `start_sql_traceback_logging` to `start_sql_logging`. I use this in a branch stacked on this one, https://code.launchpad.net/~gary/launchpad/bug838878 , to support ++profile++sqltrace conditionally generating stacktraces.

- It adds tests for the logger, which had not existed at all as far as I could find. I include tests for the functionality I added as well as existing functionality. This is bug 838869.

Lint is happy.

Reasonable QA will be to go to https://qastaging.launchpad.net/++profile++sqltrace and make sure it still generates a sql trace analysis; and run `make run LP_DEBUG_SQL=1` on a dev machine to make sure it still produces SQL.

Thank you.

Revision history for this message