← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/model/tests/test_branchmergequeuecollection.py

Merged fix-retest-colorize into redo-read-only-transactions-in-buildmaster, resolving several import conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/tests/test_branchmergequeuecollection.py
8
8
from zope.component import getUtility
9
9
from zope.security.proxy import removeSecurityProxy
10
10
 
11
 
from lp.services.database.lpstorm import IMasterStore
12
 
from canonical.testing.layers import DatabaseFunctionalLayer
13
11
from lp.app.interfaces.launchpad import ILaunchpadCelebrities
14
12
from lp.code.interfaces.branchmergequeuecollection import (
15
13
    IAllBranchMergeQueues,
20
18
from lp.code.model.branchmergequeuecollection import (
21
19
    GenericBranchMergeQueueCollection,
22
20
    )
 
21
from lp.services.database.lpstorm import IMasterStore
23
22
from lp.testing import TestCaseWithFactory
 
23
from lp.testing.layers import DatabaseFunctionalLayer
24
24
 
25
25
 
26
26
class TestGenericBranchMergeQueueCollection(TestCaseWithFactory):