Merge lp:~frankban/launchpad/bug-963461-intermittent-error into lp:launchpad

Proposed by Francesco Banconi
Status: Merged
Approved by: Francesco Banconi
Approved revision: no longer in the source branch.
Merged at revision: 15017
Proposed branch: lp:~frankban/launchpad/bug-963461-intermittent-error
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
lib/lp/services/webservice/stories/xx-hostedfile.txt (+1/-1)
To merge this branch: bzr merge lp:~frankban/launchpad/bug-963461-intermittent-error
Reviewer Review Type Date Requested Status
Benji York (community) code Approve
Review via email: mp+99268@code.launchpad.net

Description of the change

== Changes ==

This branch fixes an import error in tests, found running tests in parallel.

== Tests ==

$ bin/test -vv -t lp/services/webservice/stories/xx-hostedfile.txtRunning tests at level 1
Running lp.testing.layers.PageTestLayer tests:
  Set up lp.testing.layers.BaseLayer in 0.091 seconds.
  Set up lp.testing.layers.DatabaseLayer in 2.379 seconds.
  Set up lp.testing.layers.LibrarianLayer in 5.364 seconds.
  Set up lp.testing.layers.MemcachedLayer in 0.117 seconds.
  Set up lp.testing.layers.RabbitMQLayer in 2.116 seconds.
  Set up lp.testing.layers.LaunchpadLayer in 0.000 seconds.
  Set up lp.testing.layers.FunctionalLayer in 3.756 seconds.
  Set up lp.testing.layers.LaunchpadFunctionalLayer in 0.000 seconds.
  Set up lp.testing.layers.GoogleServiceLayer in 0.815 seconds.
  Set up lp.testing.layers.PageTestLayer in 0.000 seconds.
  Running:
 lib/lp/services/webservice/stories/xx-hostedfile.txt
  Ran 1 tests with 0 failures and 0 errors in 2.501 seconds.
Tearing down left over layers:
  Tear down lp.testing.layers.PageTestLayer in 0.000 seconds.
  Tear down lp.testing.layers.LaunchpadFunctionalLayer in 0.000 seconds.
  Tear down lp.testing.layers.LaunchpadLayer in 0.000 seconds.
  Tear down lp.testing.layers.LibrarianLayer in 0.003 seconds.
  Tear down lp.testing.layers.MemcachedLayer in 0.100 seconds.
  Tear down lp.testing.layers.RabbitMQLayer ... not supported
  Tear down lp.testing.layers.GoogleServiceLayer in 0.059 seconds.
  Tear down lp.testing.layers.FunctionalLayer ... not supported
  Tear down lp.testing.layers.DatabaseLayer in 0.570 seconds.
  Tear down lp.testing.layers.BaseLayer in 0.002 seconds.

== QA ==

None.

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

Looks good.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/services/webservice/stories/xx-hostedfile.txt'
2--- lib/lp/services/webservice/stories/xx-hostedfile.txt 2010-12-22 14:50:08 +0000
3+++ lib/lp/services/webservice/stories/xx-hostedfile.txt 2012-03-26 08:56:18 +0000
4@@ -30,7 +30,7 @@
5 We can upload branding images with PUT.
6
7 >>> import os
8- >>> import canonical
9+ >>> import canonical.launchpad
10 >>> def load_image(filename):
11 ... image_file = os.path.join(
12 ... os.path.dirname(canonical.launchpad.__file__),