msmith - in flumotion/trunk: . flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Wed May 23 13:11:57 2007
New Revision: 5018

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/test_defer.py
   flumotion/trunk/flumotion/test/test_pb.py
Log:
        * flumotion/test/test_defer.py:
        * flumotion/test/test_pb.py:
          Remove deprecated uses of reactor.iterate() which aren't needed.
          There are some remaining.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed May 23 13:11:57 2007
@@ -1,5 +1,12 @@
 2007-05-23  Michael Smith <msmith at fluendo.com>
 
+	* flumotion/test/test_defer.py:
+	* flumotion/test/test_pb.py:
+	  Remove deprecated uses of reactor.iterate() which aren't needed.
+	  There are some remaining.
+
+2007-05-23  Michael Smith <msmith at fluendo.com>
+
 	* flumotion/component/component.py:
 	  Allow the component to respond to getState() remote calls before
 	  login is complete, so that we can (in a later version) avoid some

Modified: flumotion/trunk/flumotion/test/test_defer.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_defer.py	(original)
+++ flumotion/trunk/flumotion/test/test_defer.py	Wed May 23 13:11:57 2007
@@ -25,11 +25,6 @@
 from twisted.internet import defer, reactor
 from flumotion.twisted.defer import defer_generator
 
-
-def run_until_finished():
-    while reactor.getDelayedCalls():
-        reactor.iterate(0.01)
-
 class TestDefer(unittest.TestCase):
     result = None
     error = None
@@ -60,8 +55,10 @@
 
         d = gen()
         d.addCallback(lambda x: setattr(self, 'result', x))
-        run_until_finished()
-        assert self.result == 42
+        def checkResult(res):
+            assert self.result == 42
+        d.addCallback(checkResult)
+        return d
 
     def testYieldNothing(self):
         self.result = 42
@@ -77,8 +74,10 @@
 
         d = gen()
         d.addCallback(lambda x: setattr(self, 'result', x))
-        run_until_finished()
-        assert self.result == None
+        def checkResult(res):
+            assert self.result == None
+        d.addCallback(checkResult)
+        return d
 
     def testValues(self):
         self.result = None
@@ -101,8 +100,10 @@
 
         d = gen()
         d.addCallback(lambda x: setattr(self, 'result', x))
-        run_until_finished()
-        assert self.result == 81
+        def checkResult(res):
+            assert self.result == 81
+        d.addCallback(checkResult)
+        return d
 
     def testBarfOnNongenerator(self):
         def nongen():
@@ -143,8 +144,10 @@
 
         d = gen()
         d.addCallback(lambda x: setattr(self, 'result', x))
-        run_until_finished()
-        assert self.result == True
+        def checkResult(res):
+            assert self.result == True
+        d.addCallback(checkResult)
+        return d
 
     def testExceptionChain(self):
         def divide_later(x, y):
@@ -186,6 +189,8 @@
         d.addErrback(zerodivisionerrorback)
         d.addErrback(runtimeerrorback)
         d.addCallback(checkexceptionchain)
-        run_until_finished()
-        assert self.result == ['oserror', 'zerodivisionerror'],\
-               "Unexpected exception chain: %r" % (self.result,)
+        def checkResult(res):
+            assert self.result == ['oserror', 'zerodivisionerror'],\
+                   "Unexpected exception chain: %r" % (self.result,)
+        d.addCallback(checkResult)
+        return d

Modified: flumotion/trunk/flumotion/test/test_pb.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_pb.py	(original)
+++ flumotion/trunk/flumotion/test/test_pb.py	Wed May 23 13:11:57 2007
@@ -325,8 +325,6 @@
         tlog.flushErrors(error.UnauthorizedLogin)
         log._getTheFluLogObserver().clearIgnores()
         self.port.stopListening()
-        reactor.iterate()
-        reactor.iterate()
 
     def clientDisconnect(self, factory, reference):
         # clean up broker by waiting on Disconnect notify