← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/testing/factory.py

  • Committer: Curtis Hovey
  • Date: 2011-12-24 17:49:30 UTC
  • mto: This revision was merged to the branch mainline in revision 14602.
  • Revision ID: curtis.hovey@canonical.com-20111224174930-xk1d5cvhyxq46ctf
Moved webapp to lp.services.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/testing/factory.py
64
64
    removeSecurityProxy,
65
65
    )
66
66
 
 
67
from canonical.config import config
 
68
from canonical.database.constants import (
 
69
    DEFAULT,
 
70
    UTC_NOW,
 
71
    )
 
72
from canonical.database.sqlbase import flush_database_updates
 
73
from lp.services.webapp.dbpolicy import MasterDatabasePolicy
 
74
from lp.services.webapp.interfaces import (
 
75
    DEFAULT_FLAVOR,
 
76
    IStoreSelector,
 
77
    MAIN_STORE,
 
78
    OAuthPermission,
 
79
    )
 
80
from lp.services.webapp.sorting import sorted_version_numbers
67
81
from lp.app.enums import ServiceUsage
68
82
from lp.app.interfaces.launchpad import ILaunchpadCelebrities
69
83
from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
209
223
from lp.registry.interfaces.ssh import ISSHKeySet
210
224
from lp.registry.model.milestone import Milestone
211
225
from lp.registry.model.suitesourcepackage import SuiteSourcePackage
212
 
from lp.services.config import config
213
 
from lp.services.database.constants import (
214
 
    DEFAULT,
215
 
    UTC_NOW,
216
 
    )
217
226
from lp.services.database.lpstorm import (
218
227
    IMasterStore,
219
228
    IStore,
220
229
    )
221
 
from lp.services.database.sqlbase import flush_database_updates
222
230
from lp.services.gpg.interfaces import IGPGHandler
223
231
from lp.services.identity.interfaces.account import (
224
232
    AccountCreationRationale,
245
253
    ITemporaryStorageManager,
246
254
    )
247
255
from lp.services.utils import AutoDecorate
248
 
from lp.services.webapp.dbpolicy import MasterDatabasePolicy
249
 
from lp.services.webapp.interfaces import (
250
 
    DEFAULT_FLAVOR,
251
 
    IStoreSelector,
252
 
    MAIN_STORE,
253
 
    OAuthPermission,
254
 
    )
255
 
from lp.services.webapp.sorting import sorted_version_numbers
256
256
from lp.services.worlddata.interfaces.country import ICountrySet
257
257
from lp.services.worlddata.interfaces.language import ILanguageSet
258
258
from lp.soyuz.adapters.overrides import SourceOverride
614
614
        email_address_status=None, hide_email_addresses=False,
615
615
        displayname=None, time_zone=None, latitude=None, longitude=None,
616
616
        selfgenerated_bugnotifications=False, member_of=(),
617
 
        homepage_content=None, account_status=None):
 
617
        homepage_content=None):
618
618
        """Create and return a new, arbitrary Person.
619
619
 
620
620
        :param email: The email address for the new person.
679
679
 
680
680
        removeSecurityProxy(email).status = email_address_status
681
681
 
682
 
        if account_status:
683
 
            removeSecurityProxy(person.account).status = account_status
684
682
        self.makeOpenIdIdentifier(person.account)
685
683
 
686
684
        for team in member_of:
768
766
        """
769
767
        if email_status is None:
770
768
            email_status = EmailAddressStatus.VALIDATED
 
769
        if account is None:
 
770
            account = person.account
771
771
        return getUtility(IEmailAddressSet).new(
772
772
            address, person, email_status, account)
773
773
 
4266
4266
    def makeLaunchpadService(self, person=None, version="devel"):
4267
4267
        if person is None:
4268
4268
            person = self.makePerson()
4269
 
        from lp.testing.layers import BaseLayer
 
4269
        from canonical.testing import BaseLayer
4270
4270
        launchpad = launchpadlib_for(
4271
4271
            "test", person, service_root=BaseLayer.appserver_root_url("api"),
4272
4272
            version=version)