Merge lp:~mwhudson/launchpad/upgrade-to-twisted-9 into lp:launchpad

[Michael Hudson-Doyle]

Switch to getting Twisted from an egg and upgrade to Twisted 9

[Michael Hudson-Doyle (mwhudson)]

Hi Tim,

This branch moves us to using Twisted from an egg, upgrades to Twisted 9 and skirts around a Twisted bug that interferes with some tests.

Cheers,
mwh

[Tim Penhey (thumper)]

Looks fine to me.

  merge approved

review: Approve

=== modified file 'lib/canonical/librarian/web.py'
--- lib/canonical/librarian/web.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/librarian/web.py	2009-11-25 03:10:42 +0000
@@ -7,10 +7,6 @@
 import time
 
 from twisted.web import resource, static, util, server, proxy
-try:
-    NoResource = resource.NoResource
-except AttributeError:
-    from twisted.web.error import NoResource
 from twisted.internet.threads import deferToThread
 
 from canonical.librarian.client import quote
@@ -30,7 +26,7 @@
         <!-- kthxbye. -->
         </body></html>
         """, type='text/html')
-fourOhFour = NoResource('No such resource')
+fourOhFour = resource.NoResource('No such resource')
 
 
 class NotFound(Exception):

=== modified file 'lib/canonical/twistedsupport/tests/test_processmonitor.py'
--- lib/canonical/twistedsupport/tests/test_processmonitor.py	2009-07-26 14:19:49 +0000
+++ lib/canonical/twistedsupport/tests/test_processmonitor.py	2009-11-25 03:10:42 +0000
@@ -10,7 +10,7 @@
 
 import unittest
 
-from twisted.internet import defer, error, task
+from twisted.internet import defer, error, reactor, task
 from twisted.python import failure
 from twisted.trial.unittest import TestCase as TrialTestCase
 
@@ -318,6 +318,13 @@
 
     layer = TwistedLayer
 
+    def setUp(self):
+        # XXX 2009-11-23, MichaelHudson,
+        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
+        # make sure the reactor is running when the test method is executed to
+        # work around the linked Twisted bug.
+        return task.deferLater(reactor, 0, lambda: None)
+
     def test_run_process_with_timeout_invalid_args(self):
         # `run_process_with_timeout` expects the process 'args' to be a
         # tuple.

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2009-09-07 13:02:02 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2009-11-25 03:10:42 +0000
@@ -7,7 +7,7 @@
 import transaction
 import unittest
 
-from twisted.internet import defer
+from twisted.internet import defer, task, reactor
 from twisted.internet.error import (
     ConnectionClosed, ProcessTerminated, TimeoutError)
 from twisted.python.failure import Failure
@@ -43,6 +43,11 @@
         TrialTestCase.setUp(self)
         self.slave = RecordingSlave(
             'foo', 'http://foo:8221/rpc', 'foo.host')
+        # XXX 2009-11-23, MichaelHudson,
+        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
+        # make sure the reactor is running when the test method is executed to
+        # work around the linked Twisted bug.
+        return task.deferLater(reactor, 0, lambda: None)
 
     def test_representation(self):
         """`RecordingSlave` has a custom representation.

=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2009-11-23 19:56:19 +0000
+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2009-11-25 03:10:42 +0000
@@ -17,7 +17,7 @@
 from bzrlib.branch import Branch
 from bzrlib.tests import TestCase as BzrTestCase
 
-from twisted.internet import defer, error, protocol, reactor
+from twisted.internet import defer, error, protocol, reactor, task
 from twisted.trial.unittest import TestCase as TrialTestCase
 
 from zope.component import getUtility
@@ -597,6 +597,11 @@
     def setUp(self):
         TestWorkerMonitorIntegration.setUp(self)
         self._protocol = None
+        # XXX 2009-11-23, MichaelHudson,
+        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
+        # make sure the reactor is running when the test method is executed to
+        # work around the linked Twisted bug.
+        return task.deferLater(reactor, 0, lambda: None)
 
     def performImport(self, job_id):
         """Perform the import job with ID job_id.

=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
--- lib/lp/codehosting/puller/tests/test_scheduler.py	2009-11-21 01:47:27 +0000
+++ lib/lp/codehosting/puller/tests/test_scheduler.py	2009-11-25 03:10:42 +0000
@@ -17,7 +17,7 @@
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir
 
-from twisted.internet import defer, error
+from twisted.internet import defer, error, reactor, task
 from twisted.protocols.basic import NetstringParseError
 from twisted.python import failure
 from twisted.trial.unittest import TestCase as TrialTestCase
@@ -660,6 +660,11 @@
         self.bzr_tree.commit('rev1')
         self.pushToBranch(self.db_branch, self.bzr_tree)
         self.client = FakePullerEndpointProxy()
+        # XXX 2009-11-23, MichaelHudson,
+        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
+        # make sure the reactor is running when the test method is executed to
+        # work around the linked Twisted bug.
+        return task.deferLater(reactor, 0, lambda: None)
 
     def run(self, result):
         # We want to use Trial's run() method so we can return Deferreds.

=== removed symlink 'lib/twisted'
=== target was u'../sourcecode/twisted/twisted/'
=== modified file 'setup.py'
--- setup.py	2009-10-31 12:07:16 +0000
+++ setup.py	2009-11-25 03:10:42 +0000
@@ -43,6 +43,7 @@
         'mocker',
         'oauth',
         'paramiko',
+        'pyasn1',
         'python-openid',
         'pytz',
         # This appears to be a broken indirect dependency from zope.security:
@@ -51,6 +52,7 @@
         'sourcecodegen',
         'storm',
         'transaction',
+        'Twisted', 
         'wadllib',
         'z3c.pt',
         'z3c.ptcompat',

=== modified file 'versions.cfg'
--- versions.cfg	2009-11-21 00:03:53 +0000
+++ versions.cfg	2009-11-25 03:10:42 +0000
@@ -38,6 +38,7 @@
 paramiko = 1.7.4
 Paste = 1.7.2
 PasteDeploy = 1.3.3
+pyasn1 = 0.0.9a
 pycrypto = 2.0.1
 python-openid = 2.2.1
 pytz = 2009l
@@ -50,6 +51,7 @@
 sourcecodegen = 0.6.9
 storm = 0.15
 transaction = 1.0.0
+Twisted = 9.0.0
 uuid = 1.30
 van.testing = 2.0.1
 wadllib = 1.1.4