~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/canonical/librarian/ftests/test_client.py

  • Committer: William Grant
  • Date: 2011-12-22 05:37:22 UTC
  • mto: This revision was merged to the branch mainline in revision 14581.
  • Revision ID: william.grant@canonical.com-20111222053722-gm6h9zi3lioz00ky
Move librarian stuff from canonical.launchpad to lp.services.librarian. canonical.librarian remains untouched.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
from cStringIO import StringIO
5
5
import textwrap
6
6
import unittest
7
 
from urllib2 import URLError, HTTPError
 
7
from urllib2 import (
 
8
    HTTPError,
 
9
    URLError,
 
10
    )
8
11
 
9
12
import transaction
10
13
 
11
 
from canonical.testing.layers import DatabaseLayer, LaunchpadFunctionalLayer
12
14
from canonical.config import config
13
15
from canonical.database.sqlbase import block_implicit_flushes
14
 
from lp.services.database.lpstorm import ISlaveStore
15
16
from canonical.launchpad.webapp.dbpolicy import SlaveDatabasePolicy
16
17
from canonical.librarian import client as client_module
17
18
from canonical.librarian.client import (
18
 
    LibrarianClient, LibrarianServerError, RestrictedLibrarianClient)
 
19
    LibrarianClient,
 
20
    LibrarianServerError,
 
21
    RestrictedLibrarianClient,
 
22
    )
19
23
from canonical.librarian.interfaces import UploadFailed
20
 
from canonical.launchpad.database.librarian import LibraryFileAlias
 
24
from canonical.testing.layers import (
 
25
    DatabaseLayer,
 
26
    LaunchpadFunctionalLayer,
 
27
    )
 
28
from lp.services.database.lpstorm import ISlaveStore
 
29
from lp.services.librarian.model import LibraryFileAlias
21
30
 
22
31
 
23
32
class InstrumentedLibrarianClient(LibrarianClient):