Launchpad itself

Merge lp:~mwhudson/launchpad/twisted-x into lp:launchpad

  1. twisted-x
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/twisted-x
Merge into: lp:launchpad
Diff against target: 110 lines (+4/-34)
6 files modified
lib/canonical/twistedsupport/tests/test_processmonitor.py (+0/-7)
lib/lp/buildmaster/tests/test_manager.py (+0/-5)
lib/lp/codehosting/codeimport/tests/test_workermonitor.py (+0/-5)
lib/lp/codehosting/puller/tests/test_scheduler.py (+0/-5)
lib/lp/codehosting/sshserver/service.py (+3/-11)
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/launchpad/twisted-x
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+20611@code.launchpad.net

Commit message

Upgrade to Twisted 10.0.0

Description of the change

Let's use Twisted 10.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

I love the RED in the diff :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/twistedsupport/tests/test_processmonitor.py'
2--- lib/canonical/twistedsupport/tests/test_processmonitor.py 2009-11-22 20:17:36 +0000
3+++ lib/canonical/twistedsupport/tests/test_processmonitor.py 2010-03-10 01:30:47 +0000
4@@ -318,13 +318,6 @@
5
6 layer = TwistedLayer
7
8- def setUp(self):
9- # XXX 2009-11-23, MichaelHudson,
10- # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
11- # make sure the reactor is running when the test method is executed to
12- # work around the linked Twisted bug.
13- return task.deferLater(reactor, 0, lambda: None)
14-
15 def test_run_process_with_timeout_invalid_args(self):
16 # `run_process_with_timeout` expects the process 'args' to be a
17 # tuple.
18
19=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
20--- lib/lp/buildmaster/tests/test_manager.py 2010-03-06 00:32:52 +0000
21+++ lib/lp/buildmaster/tests/test_manager.py 2010-03-10 01:30:47 +0000
22@@ -43,11 +43,6 @@
23 TrialTestCase.setUp(self)
24 self.slave = RecordingSlave(
25 'foo', 'http://foo:8221/rpc', 'foo.host')
26- # XXX 2009-11-23, MichaelHudson,
27- # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
28- # make sure the reactor is running when the test method is executed to
29- # work around the linked Twisted bug.
30- return task.deferLater(reactor, 0, lambda: None)
31
32 def test_representation(self):
33 """`RecordingSlave` has a custom representation.
34
35=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
36--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2010-02-24 10:18:16 +0000
37+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2010-03-10 01:30:47 +0000
38@@ -695,11 +695,6 @@
39 def setUp(self):
40 TestWorkerMonitorIntegration.setUp(self)
41 self._protocol = None
42- # XXX 2009-11-23, MichaelHudson,
43- # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
44- # make sure the reactor is running when the test method is executed to
45- # work around the linked Twisted bug.
46- return task.deferLater(reactor, 0, lambda: None)
47
48 def performImport(self, job_id):
49 """Perform the import job with ID job_id.
50
51=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
52--- lib/lp/codehosting/puller/tests/test_scheduler.py 2010-02-24 04:24:01 +0000
53+++ lib/lp/codehosting/puller/tests/test_scheduler.py 2010-03-10 01:30:47 +0000
54@@ -662,11 +662,6 @@
55 self.bzr_tree.commit('rev1')
56 self.pushToBranch(self.db_branch, self.bzr_tree)
57 self.client = FakePullerEndpointProxy()
58- # XXX 2009-11-23, MichaelHudson,
59- # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
60- # make sure the reactor is running when the test method is executed to
61- # work around the linked Twisted bug.
62- return task.deferLater(reactor, 0, lambda: None)
63
64 def run(self, result):
65 # We want to use Trial's run() method so we can return Deferreds.
66
67=== modified file 'lib/lp/codehosting/sshserver/service.py'
68--- lib/lp/codehosting/sshserver/service.py 2009-06-25 04:06:00 +0000
69+++ lib/lp/codehosting/sshserver/service.py 2010-03-10 01:30:47 +0000
70@@ -46,6 +46,8 @@
71 to and disconnection from the SSH server.
72 """
73
74+ protocol = KeepAliveSettingSSHServerTransport
75+
76 def __init__(self, portal):
77 # Although 'portal' isn't part of the defined interface for
78 # `SSHFactory`, defining it here is how the `SSHUserAuthServer` gets
79@@ -60,17 +62,7 @@
80 The protocol object we return is slightly modified so that we can hook
81 into the 'connectionLost' event and log the disconnection.
82 """
83- # If Conch let us customize the protocol class, we wouldn't need this.
84- # See http://twistedmatrix.com/trac/ticket/3443.
85- transport = KeepAliveSettingSSHServerTransport()
86- transport.supportedPublicKeys = self.privateKeys.keys()
87- if not self.primes:
88- log.msg('disabling diffie-hellman-group-exchange because we '
89- 'cannot find moduli file')
90- ske = transport.supportedKeyExchanges[:]
91- ske.remove('diffie-hellman-group-exchange-sha1')
92- transport.supportedKeyExchanges = ske
93- transport.factory = self
94+ transport = SSHFactory.buildProtocol(self, address)
95 transport._realConnectionLost = transport.connectionLost
96 transport.connectionLost = (
97 lambda reason: self.connectionLost(transport, reason))
98
99=== modified file 'versions.cfg'
100--- versions.cfg 2010-03-02 17:24:50 +0000
101+++ versions.cfg 2010-03-10 01:30:47 +0000
102@@ -61,7 +61,7 @@
103 storm = 0.15danilo-storm-launchpad-r342
104 testtools = 0.9.2
105 transaction = 1.0.0
106-Twisted = 9.0.0
107+Twisted = 10.0.0
108 uuid = 1.30
109 van.testing = 2.0.1
110 wadllib = 1.1.4