Launchpad itself

Merge lp:~jml/launchpad/twisted-services into lp:launchpad

  1. twisted-services
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jml/launchpad/twisted-services
Merge into: lp:launchpad
Diff against target: 353 lines (+46/-45)
17 files modified
cronscripts/supermirror-pull.py (+2/-2)
lib/lp/buildmaster/manager.py (+2/-1)
lib/lp/codehosting/codeimport/tests/test_workermonitor.py (+5/-5)
lib/lp/codehosting/codeimport/workermonitor.py (+4/-4)
lib/lp/codehosting/puller/scheduler.py (+3/-3)
lib/lp/codehosting/puller/tests/test_scheduler.py (+8/-8)
lib/lp/codehosting/sftp.py (+2/-2)
lib/lp/codehosting/sshserver/accesslog.py (+1/-1)
lib/lp/codehosting/sshserver/service.py (+2/-3)
lib/lp/codehosting/sshserver/tests/test_auth.py (+2/-2)
lib/lp/codehosting/vfs/transport.py (+2/-1)
lib/lp/services/job/runner.py (+3/-3)
lib/lp/services/twistedsupport/tests/test_loggingsupport.py (+3/-3)
lib/lp/services/twistedsupport/tests/test_processmonitor.py (+3/-3)
lib/lp/services/twistedsupport/tests/test_task.py (+1/-1)
lib/lp/services/twistedsupport/tests/test_twistedsupport.py (+2/-2)
scripts/code-import-worker-monitor.py (+1/-1)
To merge this branch: bzr merge lp:~jml/launchpad/twisted-services
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+21716@code.launchpad.net

Commit message

Move canonical.twistedsupport to lp.services.twistedsupport

Description of the change

This patch moves canonical.twistedsupport to lp.services.twistedsupport.

It cleans up some flakes along the way and orders imports correctly.

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cronscripts/supermirror-pull.py'
--- cronscripts/supermirror-pull.py 2010-02-24 04:24:01 +0000
+++ cronscripts/supermirror-pull.py 2010-03-19 10:48:30 +0000
@@ -11,10 +11,10 @@
11from twisted.internet import defer, reactor11from twisted.internet import defer, reactor
12from twisted.python import log as tplog12from twisted.python import log as tplog
1313
14from lp.codehosting.puller import mirror, scheduler
15from canonical.config import config14from canonical.config import config
16from canonical.launchpad.scripts import logger_options15from canonical.launchpad.scripts import logger_options
17from canonical.twistedsupport.loggingsupport import (16from lp.codehosting.puller import mirror, scheduler
17from lp.services.twistedsupport.loggingsupport import (
18 LoggingProxy, set_up_logging_for_script)18 LoggingProxy, set_up_logging_for_script)
1919
20def clean_shutdown(ignored):20def clean_shutdown(ignored):
2121
=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py 2010-03-04 16:12:33 +0000
+++ lib/lp/buildmaster/manager.py 2010-03-19 10:48:30 +0000
@@ -30,8 +30,9 @@
30from canonical.config import config30from canonical.config import config
31from canonical.launchpad.webapp import urlappend31from canonical.launchpad.webapp import urlappend
32from canonical.librarian.db import write_transaction32from canonical.librarian.db import write_transaction
33from canonical.twistedsupport.processmonitor import run_process_with_timeout
34from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME33from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
34from lp.services.twistedsupport.processmonitor import run_process_with_timeout
35
3536
36buildd_success_result_map = {37buildd_success_result_map = {
37 'ensurepresent': True,38 'ensurepresent': True,
3839
=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2010-03-14 10:38:48 +0000
+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2010-03-19 10:48:30 +0000
@@ -18,8 +18,8 @@
18from bzrlib.branch import Branch18from bzrlib.branch import Branch
19from bzrlib.tests import TestCase as BzrTestCase19from bzrlib.tests import TestCase as BzrTestCase
2020
21from twisted.internet import defer, error, protocol, reactor, task21from twisted.internet import defer, error, protocol, reactor
22from twisted.python import failure, log22from twisted.python import log
23from twisted.trial.unittest import TestCase as TrialTestCase23from twisted.trial.unittest import TestCase as TrialTestCase
24from twisted.web import xmlrpc24from twisted.web import xmlrpc
2525
@@ -32,9 +32,6 @@
32from canonical.launchpad.xmlrpc.faults import NoSuchCodeImportJob32from canonical.launchpad.xmlrpc.faults import NoSuchCodeImportJob
33from canonical.testing.layers import (33from canonical.testing.layers import (
34 TwistedAppServerLayer, TwistedLaunchpadZopelessLayer, TwistedLayer)34 TwistedAppServerLayer, TwistedLaunchpadZopelessLayer, TwistedLayer)
35from canonical.twistedsupport import suppress_stderr
36from canonical.twistedsupport.tests.test_processmonitor import (
37 makeFailure, ProcessTestsMixin)
3835
39from lp.code.enums import (36from lp.code.enums import (
40 CodeImportResultStatus, CodeImportReviewStatus, RevisionControlSystems)37 CodeImportResultStatus, CodeImportReviewStatus, RevisionControlSystems)
@@ -52,6 +49,9 @@
52 CVSServer, GitServer, MercurialServer, SubversionServer)49 CVSServer, GitServer, MercurialServer, SubversionServer)
53from lp.codehosting.codeimport.tests.test_worker import (50from lp.codehosting.codeimport.tests.test_worker import (
54 clean_up_default_stores_for_import)51 clean_up_default_stores_for_import)
52from lp.services.twistedsupport import suppress_stderr
53from lp.services.twistedsupport.tests.test_processmonitor import (
54 makeFailure, ProcessTestsMixin)
55from lp.testing import login, logout, TestCase55from lp.testing import login, logout, TestCase
56from lp.testing.factory import LaunchpadObjectFactory56from lp.testing.factory import LaunchpadObjectFactory
5757
5858
=== modified file 'lib/lp/codehosting/codeimport/workermonitor.py'
--- lib/lp/codehosting/codeimport/workermonitor.py 2010-03-11 23:21:41 +0000
+++ lib/lp/codehosting/codeimport/workermonitor.py 2010-03-19 10:48:30 +0000
@@ -21,12 +21,12 @@
21from canonical.config import config21from canonical.config import config
22from canonical.launchpad.xmlrpc.faults import NoSuchCodeImportJob22from canonical.launchpad.xmlrpc.faults import NoSuchCodeImportJob
23from canonical.librarian.interfaces import IFileUploadClient23from canonical.librarian.interfaces import IFileUploadClient
24from canonical.twistedsupport.loggingsupport import (24from lp.code.enums import CodeImportResultStatus
25from lp.codehosting.codeimport.worker import CodeImportWorkerExitCode
26from lp.services.twistedsupport.loggingsupport import (
25 log_oops_from_failure)27 log_oops_from_failure)
26from canonical.twistedsupport.processmonitor import (28from lp.services.twistedsupport.processmonitor import (
27 ProcessMonitorProtocolWithTimeout)29 ProcessMonitorProtocolWithTimeout)
28from lp.code.enums import CodeImportResultStatus
29from lp.codehosting.codeimport.worker import CodeImportWorkerExitCode
3030
3131
32class CodeImportWorkerMonitorProtocol(ProcessMonitorProtocolWithTimeout):32class CodeImportWorkerMonitorProtocol(ProcessMonitorProtocolWithTimeout):
3333
=== modified file 'lib/lp/codehosting/puller/scheduler.py'
--- lib/lp/codehosting/puller/scheduler.py 2010-02-24 04:24:01 +0000
+++ lib/lp/codehosting/puller/scheduler.py 2010-03-19 10:48:30 +0000
@@ -24,16 +24,16 @@
2424
25import canonical25import canonical
26from canonical.cachedproperty import cachedproperty26from canonical.cachedproperty import cachedproperty
27from canonical.twistedsupport.task import (
28 ParallelLimitedTaskConsumer, PollingTaskSource)
29from lp.codehosting.puller.worker import (27from lp.codehosting.puller.worker import (
30 get_canonical_url_for_branch_name)28 get_canonical_url_for_branch_name)
31from lp.codehosting.puller import get_lock_id_for_branch_id29from lp.codehosting.puller import get_lock_id_for_branch_id
32from canonical.config import config30from canonical.config import config
33from canonical.launchpad.webapp import errorlog31from canonical.launchpad.webapp import errorlog
34from canonical.launchpad.xmlrpc import faults32from canonical.launchpad.xmlrpc import faults
35from canonical.twistedsupport.processmonitor import (33from lp.services.twistedsupport.processmonitor import (
36 ProcessMonitorProtocolWithTimeout)34 ProcessMonitorProtocolWithTimeout)
35from lp.services.twistedsupport.task import (
36 ParallelLimitedTaskConsumer, PollingTaskSource)
3737
3838
39class BadMessage(Exception):39class BadMessage(Exception):
4040
=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
--- lib/lp/codehosting/puller/tests/test_scheduler.py 2010-03-04 20:14:46 +0000
+++ lib/lp/codehosting/puller/tests/test_scheduler.py 2010-03-19 10:48:30 +0000
@@ -16,27 +16,27 @@
16from bzrlib.branch import Branch16from bzrlib.branch import Branch
17from bzrlib.bzrdir import BzrDir17from bzrlib.bzrdir import BzrDir
1818
19from twisted.internet import defer, error, reactor, task19from twisted.internet import defer, error, reactor
20from twisted.protocols.basic import NetstringParseError20from twisted.protocols.basic import NetstringParseError
21from twisted.python import failure21from twisted.python import failure
22from twisted.trial.unittest import TestCase as TrialTestCase22from twisted.trial.unittest import TestCase as TrialTestCase
2323
24from zope.component import getUtility24from zope.component import getUtility
2525
26from canonical.config import config
27from canonical.launchpad.webapp import errorlog
28from canonical.launchpad.xmlrpc import faults
29from canonical.testing import (
30 reset_logging, TwistedLayer, TwistedAppServerLayer)
26from lp.codehosting.puller import get_lock_id_for_branch_id, scheduler31from lp.codehosting.puller import get_lock_id_for_branch_id, scheduler
27from lp.codehosting.puller.tests import PullerBranchTestCase32from lp.codehosting.puller.tests import PullerBranchTestCase
28from lp.codehosting.puller.worker import (33from lp.codehosting.puller.worker import (
29 get_canonical_url_for_branch_name)34 get_canonical_url_for_branch_name)
30from canonical.config import config
31from lp.code.enums import BranchType35from lp.code.enums import BranchType
32from lp.code.interfaces.branchlookup import IBranchLookup36from lp.code.interfaces.branchlookup import IBranchLookup
37from lp.services.twistedsupport.tests.test_processmonitor import (
38 makeFailure, suppress_stderr, ProcessTestsMixin)
33from lp.testing.factory import ObjectFactory39from lp.testing.factory import ObjectFactory
34from canonical.launchpad.webapp import errorlog
35from canonical.launchpad.xmlrpc import faults
36from canonical.testing import (
37 reset_logging, TwistedLayer, TwistedAppServerLayer)
38from canonical.twistedsupport.tests.test_processmonitor import (
39 makeFailure, suppress_stderr, ProcessTestsMixin)
4040
4141
42class FakePullerEndpointProxy:42class FakePullerEndpointProxy:
4343
=== modified file 'lib/lp/codehosting/sftp.py'
--- lib/lp/codehosting/sftp.py 2010-01-20 20:51:48 +0000
+++ lib/lp/codehosting/sftp.py 2010-03-19 10:48:30 +0000
@@ -14,7 +14,7 @@
1414
15__metaclass__ = type15__metaclass__ = type
16__all__ = [16__all__ = [
17 'AvatarToSFTPAdapter',17 'avatar_to_sftp_server',
18 'FileTransferServer',18 'FileTransferServer',
19 'TransportSFTPServer',19 'TransportSFTPServer',
20 ]20 ]
@@ -40,7 +40,7 @@
40from lp.codehosting.vfs import AsyncLaunchpadTransport, LaunchpadServer40from lp.codehosting.vfs import AsyncLaunchpadTransport, LaunchpadServer
41from lp.codehosting.sshserver import accesslog41from lp.codehosting.sshserver import accesslog
42from canonical.config import config42from canonical.config import config
43from canonical.twistedsupport import gatherResults43from lp.services.twistedsupport import gatherResults
4444
4545
46class FileIsADirectory(bzr_errors.PathError):46class FileIsADirectory(bzr_errors.PathError):
4747
=== modified file 'lib/lp/codehosting/sshserver/accesslog.py'
--- lib/lp/codehosting/sshserver/accesslog.py 2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/sshserver/accesslog.py 2010-03-19 10:48:30 +0000
@@ -29,7 +29,7 @@
2929
30from canonical.config import config30from canonical.config import config
31from canonical.launchpad.scripts import WatchedFileHandler31from canonical.launchpad.scripts import WatchedFileHandler
32from canonical.twistedsupport.loggingsupport import set_up_oops_reporting32from lp.services.twistedsupport.loggingsupport import set_up_oops_reporting
3333
3434
35def synchronize(source, target, add, remove):35def synchronize(source, target, add, remove):
3636
=== modified file 'lib/lp/codehosting/sshserver/service.py'
--- lib/lp/codehosting/sshserver/service.py 2010-03-03 23:45:34 +0000
+++ lib/lp/codehosting/sshserver/service.py 2010-03-19 10:48:30 +0000
@@ -20,15 +20,14 @@
20from twisted.conch.ssh.transport import SSHServerTransport20from twisted.conch.ssh.transport import SSHServerTransport
21from twisted.internet import defer21from twisted.internet import defer
22from twisted.protocols.policies import TimeoutFactory22from twisted.protocols.policies import TimeoutFactory
23from twisted.python import log
24from twisted.web.xmlrpc import Proxy23from twisted.web.xmlrpc import Proxy
2524
26from zope.event import notify25from zope.event import notify
2726
27from canonical.config import config
28from lp.codehosting.sshserver import accesslog28from lp.codehosting.sshserver import accesslog
29from lp.codehosting.sshserver.auth import get_portal, SSHUserAuthServer29from lp.codehosting.sshserver.auth import get_portal, SSHUserAuthServer
30from canonical.config import config30from lp.services.twistedsupport import gatherResults
31from canonical.twistedsupport import gatherResults
3231
3332
34class KeepAliveSettingSSHServerTransport(SSHServerTransport):33class KeepAliveSettingSSHServerTransport(SSHServerTransport):
3534
=== modified file 'lib/lp/codehosting/sshserver/tests/test_auth.py'
--- lib/lp/codehosting/sshserver/tests/test_auth.py 2009-07-17 00:26:05 +0000
+++ lib/lp/codehosting/sshserver/tests/test_auth.py 2010-03-19 10:48:30 +0000
@@ -22,11 +22,11 @@
2222
23from twisted.trial.unittest import TestCase as TrialTestCase23from twisted.trial.unittest import TestCase as TrialTestCase
2424
25from lp.codehosting.sshserver import auth, service
26from canonical.config import config25from canonical.config import config
27from canonical.launchpad.xmlrpc import faults26from canonical.launchpad.xmlrpc import faults
28from canonical.testing.layers import TwistedLayer27from canonical.testing.layers import TwistedLayer
29from canonical.twistedsupport import suppress_stderr28from lp.codehosting.sshserver import auth, service
29from lp.services.twistedsupport import suppress_stderr
3030
3131
32class MockRealm:32class MockRealm:
3333
=== modified file 'lib/lp/codehosting/vfs/transport.py'
--- lib/lp/codehosting/vfs/transport.py 2010-02-16 23:59:40 +0000
+++ lib/lp/codehosting/vfs/transport.py 2010-03-19 10:48:30 +0000
@@ -30,7 +30,8 @@
30 unregister_transport)30 unregister_transport)
3131
32from twisted.internet import defer32from twisted.internet import defer
33from canonical.twistedsupport import extract_result, gatherResults33
34from lp.services.twistedsupport import extract_result, gatherResults
3435
3536
36class TranslationError(BzrError):37class TranslationError(BzrError):
3738
=== modified file 'lib/lp/services/job/runner.py'
--- lib/lp/services/job/runner.py 2010-03-15 13:57:06 +0000
+++ lib/lp/services/job/runner.py 2010-03-19 10:48:30 +0000
@@ -34,11 +34,11 @@
34from canonical.lp import initZopeless34from canonical.lp import initZopeless
35from canonical.launchpad import scripts35from canonical.launchpad import scripts
36from canonical.launchpad.webapp import errorlog36from canonical.launchpad.webapp import errorlog
37from canonical.twistedsupport.task import (
38 ParallelLimitedTaskConsumer, PollingTaskSource)
39from lp.services.scripts.base import LaunchpadCronScript
40from lp.services.job.interfaces.job import LeaseHeld, IRunnableJob, IJob37from lp.services.job.interfaces.job import LeaseHeld, IRunnableJob, IJob
41from lp.services.mail.sendmail import MailController38from lp.services.mail.sendmail import MailController
39from lp.services.scripts.base import LaunchpadCronScript
40from lp.services.twistedsupport.task import (
41 ParallelLimitedTaskConsumer, PollingTaskSource)
4242
4343
44class BaseRunnableJob:44class BaseRunnableJob:
4545
=== renamed directory 'lib/canonical/twistedsupport' => 'lib/lp/services/twistedsupport'
=== modified file 'lib/lp/services/twistedsupport/tests/test_loggingsupport.py'
--- lib/canonical/twistedsupport/tests/test_loggingsupport.py 2009-06-25 05:30:52 +0000
+++ lib/lp/services/twistedsupport/tests/test_loggingsupport.py 2010-03-19 10:48:30 +0000
@@ -21,12 +21,12 @@
2121
22from canonical.config import config22from canonical.config import config
23from canonical.launchpad.webapp.errorlog import globalErrorUtility23from canonical.launchpad.webapp.errorlog import globalErrorUtility
24from lp.testing import TestCase as LaunchpadTestCase
25from canonical.testing.layers import TwistedLayer24from canonical.testing.layers import TwistedLayer
26from canonical.twistedsupport.loggingsupport import (25from lp.services.twistedsupport.loggingsupport import (
27 LaunchpadLogFile, OOPSLoggingObserver)26 LaunchpadLogFile, OOPSLoggingObserver)
28from canonical.twistedsupport.tests.test_processmonitor import (27from lp.services.twistedsupport.tests.test_processmonitor import (
29 makeFailure, suppress_stderr)28 makeFailure, suppress_stderr)
29from lp.testing import TestCase as LaunchpadTestCase
3030
3131
32UTC = pytz.utc32UTC = pytz.utc
3333
=== modified file 'lib/lp/services/twistedsupport/tests/test_processmonitor.py'
--- lib/canonical/twistedsupport/tests/test_processmonitor.py 2010-02-24 03:20:11 +0000
+++ lib/lp/services/twistedsupport/tests/test_processmonitor.py 2010-03-19 10:48:30 +0000
@@ -10,13 +10,13 @@
1010
11import unittest11import unittest
1212
13from twisted.internet import defer, error, reactor, task13from twisted.internet import defer, error, task
14from twisted.python import failure14from twisted.python import failure
15from twisted.trial.unittest import TestCase as TrialTestCase15from twisted.trial.unittest import TestCase as TrialTestCase
1616
17from canonical.testing import TwistedLayer17from canonical.testing import TwistedLayer
18from canonical.twistedsupport import suppress_stderr18from lp.services.twistedsupport import suppress_stderr
19from canonical.twistedsupport.processmonitor import (19from lp.services.twistedsupport.processmonitor import (
20 ProcessMonitorProtocol, ProcessMonitorProtocolWithTimeout,20 ProcessMonitorProtocol, ProcessMonitorProtocolWithTimeout,
21 ProcessProtocolWithTwoStageKill, run_process_with_timeout)21 ProcessProtocolWithTwoStageKill, run_process_with_timeout)
2222
2323
=== modified file 'lib/lp/services/twistedsupport/tests/test_task.py'
--- lib/canonical/twistedsupport/tests/test_task.py 2010-01-17 06:23:01 +0000
+++ lib/lp/services/twistedsupport/tests/test_task.py 2010-03-19 10:48:30 +0000
@@ -13,7 +13,7 @@
1313
14from zope.interface import implements14from zope.interface import implements
1515
16from canonical.twistedsupport.task import (16from lp.services.twistedsupport.task import (
17 AlreadyRunningError, ITaskConsumer, ITaskSource, NotRunningError,17 AlreadyRunningError, ITaskConsumer, ITaskSource, NotRunningError,
18 ParallelLimitedTaskConsumer, PollingTaskSource)18 ParallelLimitedTaskConsumer, PollingTaskSource)
19from lp.testing import TestCase19from lp.testing import TestCase
2020
=== modified file 'lib/lp/services/twistedsupport/tests/test_twistedsupport.py'
--- lib/canonical/twistedsupport/tests/test_twistedsupport.py 2009-06-25 05:30:52 +0000
+++ lib/lp/services/twistedsupport/tests/test_twistedsupport.py 2010-03-19 10:48:30 +0000
@@ -1,7 +1,7 @@
1# Copyright 2009 Canonical Ltd. This software is licensed under the1# Copyright 2009 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
33
4"""Tests for things found directly in `canonical.twistedsupport`."""4"""Tests for things found directly in `lp.services.twistedsupport`."""
55
6__metaclass__ = type6__metaclass__ = type
77
@@ -9,7 +9,7 @@
99
10from twisted.internet import defer10from twisted.internet import defer
1111
12from canonical.twistedsupport import extract_result12from lp.services.twistedsupport import extract_result
13from lp.testing import TestCase13from lp.testing import TestCase
1414
15class TestExtractResult(TestCase):15class TestExtractResult(TestCase):
1616
=== modified file 'scripts/code-import-worker-monitor.py'
--- scripts/code-import-worker-monitor.py 2010-03-11 23:21:41 +0000
+++ scripts/code-import-worker-monitor.py 2010-03-19 10:48:30 +0000
@@ -25,11 +25,11 @@
25from twisted.web import xmlrpc25from twisted.web import xmlrpc
2626
27from canonical.config import config27from canonical.config import config
28from canonical.twistedsupport.loggingsupport import set_up_oops_reporting
2928
30from lp.codehosting.codeimport.workermonitor import (29from lp.codehosting.codeimport.workermonitor import (
31 CodeImportWorkerMonitor)30 CodeImportWorkerMonitor)
32from lp.services.scripts.base import LaunchpadScript31from lp.services.scripts.base import LaunchpadScript
32from lp.services.twistedsupport.loggingsupport import set_up_oops_reporting
3333
3434
35class CodeImportWorker(LaunchpadScript):35class CodeImportWorker(LaunchpadScript):