msmith - in flumotion/trunk: . flumotion/test flumotion/twisted

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Thu May 24 13:55:56 2007
New Revision: 5028

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/test_common_messages.py
   flumotion/trunk/flumotion/twisted/integration.py
Log:
        * flumotion/test/test_common_messages.py:
          Actually port a test to twisted 2 that was never ported.
        * flumotion/twisted/integration.py:
          Another 1.3 compat chunk.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu May 24 13:55:56 2007
@@ -1,5 +1,12 @@
 2007-05-24  Michael Smith <msmith at fluendo.com>
 
+	* flumotion/test/test_common_messages.py:
+	  Actually port a test to twisted 2 that was never ported.
+	* flumotion/twisted/integration.py:
+	  Another 1.3 compat chunk.
+
+2007-05-24  Michael Smith <msmith at fluendo.com>
+
 	* flumotion/test/common.py:
 	* flumotion/test/test_dialogs.py:
 	* flumotion/test/test_http.py:

Modified: flumotion/trunk/flumotion/test/test_common_messages.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_common_messages.py	(original)
+++ flumotion/trunk/flumotion/test/test_common_messages.py	Thu May 24 13:55:56 2007
@@ -319,65 +319,61 @@
         return d
 
     def testMessageAppendRemove(self):
-        # this is what we eventually want; get the messages removed properly
-        # from the list key
-
-        # start everything
-        d = self.runClient()
-
-        if False: # Twisted 1.3 version
-            unittest.deferredResult(d)
-        
-            # get the state
+        def clientRunning(result):
             d = self.perspective.callRemote('getState')
-            state = unittest.deferredResult(d)
-
-            self.failUnless(state)
-            self.assertEqual(len(state.get('messages')), 0)
+            d.addCallback(gotState)
+            return d
+        def gotState(result):
+            self._state = result
+            self.failUnless(self._state)
+            self.assertEqual(len(self._state.get('messages')), 0)
 
             # ask server to append a message
             d = self.perspective.callRemote('appendMessage')
-            r = unittest.deferredResult(d)
-
-            l = state.get('messages')
+            d.addCallback(messageAdded)
+            return d
+        def messageAdded(result):
+            l = self._state.get('messages')
             self.assertEquals(len(l), 1)
             self.assertEquals(l[0].level, messages.INFO)
 
             # ask server to append another message
             d = self.perspective.callRemote('appendOtherMessage')
-            r = unittest.deferredResult(d)
-
-            l = state.get('messages')
+            d.addCallback(otherMessageAdded)
+            return d
+        def otherMessageAdded(result):
+            l = self._state.get('messages')
             self.assertEquals(len(l), 2)
             self.assertEquals(l[0].level, messages.INFO)
             self.assertEquals(l[1].level, messages.WARNING)
 
             # ask server to remove other message
             d = self.perspective.callRemote('removeOtherMessage')
-            r = unittest.deferredResult(d)
-
-            l = state.get('messages')
+            d.addCallback(removedOtherMessage)
+            return d
+        def removedOtherMessage(result):
+            l = self._state.get('messages')
             self.assertEquals(len(l), 1)
             self.assertEquals(l[0].level, messages.INFO)
 
             # ask server to remove first message
             d = self.perspective.callRemote('removeMessage')
-            r = unittest.deferredResult(d)
-
-            l = state.get('messages')
+            d.addCallback(removedFirstMessage)
+            return d
+        def removedFirstMessage(result):
+            l = self._state.get('messages')
             self.assertEquals(len(l), 0)
 
             # stop
-            unittest.deferredResult(self.stopClient())
-        else:
-            def runClientCallback(result):
-                d = self.stopClient()
-                def stopClientCallback(res):
-                    pass
-                d.addCallback(stopClientCallback)
-                return d
-            d.addCallback(runClientCallback)
+            d = self.stopClient()
+            def stopClientCallback(res):
+                pass
+            d.addCallback(stopClientCallback)
             return d
+        # start everything
+        d = self.runClient()
+        d.addCallback(clientRunning)
+        return d
 
 if __name__ == '__main__':
     unittest.main()

Modified: flumotion/trunk/flumotion/twisted/integration.py
==============================================================================
--- flumotion/trunk/flumotion/twisted/integration.py	(original)
+++ flumotion/trunk/flumotion/twisted/integration.py	Thu May 24 13:55:56 2007
@@ -23,7 +23,6 @@
 import signal
 
 from twisted.python import failure
-import twisted.copyright
 from twisted.internet import reactor, protocol, defer
 from flumotion.common import log as flog
 
@@ -452,13 +451,7 @@
     def wrappedtest(self):
         plan = Plan(self, testName)
         proc(self, plan)
-        if twisted.copyright.version < '2.0':
-            # FIXME T1.3
-            info('using deferredResult for old trial')
-            from twisted.trial import unittest
-            return unittest.deferredResult(plan.execute())
-        else:
-            return plan.execute()
+        return plan.execute()
     try:
         wrappedtest.__name__ = testName
     except Exception: