msmith - in flumotion/trunk: . flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Wed May 23 13:30:07 2007
New Revision: 5021

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/test_component.py
Log:
        * flumotion/test/test_component.py:
          Rewrite this test in a twisted-2.0 compatible way.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed May 23 13:30:07 2007
@@ -1,3 +1,8 @@
+2007-05-23  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/test/test_component.py:
+	  Rewrite this test in a twisted-2.0 compatible way.
+
 2007-05-23  Andy Wingo  <wingo at pobox.com>
 
 	* flumotion/wizard/steps.py (Vorbis.worker_changed): Remove print.

Modified: flumotion/trunk/flumotion/test/test_component.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_component.py	(original)
+++ flumotion/trunk/flumotion/test/test_component.py	Wed May 23 13:30:07 2007
@@ -248,7 +248,12 @@
 
     def testErrors(self):
         d, pipeline = pipelineFactory('')
-        self.failUnlessFailure(d, errors.ComponentSetupHandledError)
+        def _cb(r):
+            self.fail("Didn't get expected failure, received %r" % (r,))
+        def _eb(failure):
+            failure.trap(errors.ComponentSetupHandledError)
+            return failure.value
+        d.addCallbacks(_cb, _eb)
         return d
     
 if __name__ == '__main__':