~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/services/librarian/tests/test_apachelogparser.py

  • Committer: William Grant
  • Date: 2011-12-22 23:28:30 UTC
  • mfrom: (14585 devel)
  • mto: This revision was merged to the branch mainline in revision 14586.
  • Revision ID: william.grant@canonical.com-20111222232830-qjyioyjc3lqnxrka
Merge devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
    ANONYMOUS,
13
13
    login,
14
14
    )
15
 
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
16
15
from canonical.testing.layers import (
17
16
    DatabaseFunctionalLayer,
18
17
    ZopelessLayer,
21
20
    get_method_and_path,
22
21
    parse_file,
23
22
    )
24
 
from lp.services.apachelogparser.librarian_apache_log_parser import (
25
 
    get_library_file_id,
26
 
    )
 
23
from lp.services.librarian.apachelogparser import get_library_file_id
 
24
from lp.services.librarian.interfaces import ILibraryFileAliasSet
27
25
from lp.services.log.logger import BufferLogger
28
26
from lp.testing import TestCase
29
27