msmith - in flumotion/trunk: . flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Tue May 22 19:52:06 2007
New Revision: 5009

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/test_component.py
Log:
        * flumotion/test/test_component.py:
          Fix parser error test, stop skipping it.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Tue May 22 19:52:06 2007
@@ -1,3 +1,8 @@
+2007-05-22  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/test/test_component.py:
+	  Fix parser error test, stop skipping it.
+
 2007-05-22  Andy Wingo  <wingo at pobox.com>
 
 	* flumotion/component/bouncers/Makefile.am.

Modified: flumotion/trunk/flumotion/test/test_component.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_component.py	(original)
+++ flumotion/trunk/flumotion/test/test_component.py	Tue May 22 19:52:06 2007
@@ -26,6 +26,7 @@
 from twisted.python import failure
 from twisted.internet import defer
 
+from flumotion.common import errors
 from flumotion.component.feedcomponent import ParseLaunchComponent
 from flumotion.twisted.defer import defer_generator_method
 
@@ -69,16 +70,16 @@
     d = defer.Deferred()
     dd = t.config()
     def pipelineConfigCallback(result):
-        res = None
-        try:
-            res = t.parse_pipeline(pipeline)
-            t.stop()
-            d.callback(res)
-        except Exception, e:
-            d.errback(e)
-    dd.addCallback(pipelineConfigCallback)
+        res = t.parse_pipeline(pipeline)
+        t.stop()
+        return res
+    def _eb(failure):
+        t.stop()
+        return failure
+
+    dd.addCallbacks(pipelineConfigCallback, _eb)
     # return a tuple because we need a reference to the PipelineTest object
-    return (d, t)
+    return (dd, t)
 
 class TestExpandElementName(unittest.TestCase):
     def setUp(self):
@@ -247,15 +248,8 @@
 
     def testErrors(self):
         d, pipeline = pipelineFactory('')
-        def notCalled(res):
-            self.fail("Should not be reachable")
-        def pipelineFactoryErrback(f):
-            assert(isinstance(f, failure.Failure))
-
-        d.addCallback(notCalled)
-        d.addErrback(pipelineFactoryErrback)
+        self.failUnlessFailure(d, errors.ComponentSetupHandledError)
         return d
-    testErrors.skip = "Help, I cant seem to port properly"
     
 if __name__ == '__main__':
     unittest.main()