arek - in flumotion/trunk: . flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: arek
Date: Mon Jul 30 18:57:21 2007
New Revision: 5385

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/test_comptest.py
Log:
	* flumotion/test/test_comptest.py (CompatTestCase, CompTestTestCase,
	  TestComponentWrapper):
	Add failUnlessFailure method (for Twisted 2.0 compatibility).



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Jul 30 18:57:21 2007
@@ -1,5 +1,11 @@
 2007-07-30  Arek Korbik  <arkadini at gmail.com>
 
+	* flumotion/test/test_comptest.py (CompatTestCase, CompTestTestCase,
+	  TestComponentWrapper):
+	Add failUnlessFailure method (for Twisted 2.0 compatibility).
+
+2007-07-30  Arek Korbik  <arkadini at gmail.com>
+
 	* flumotion/test/test_comptest.py:
 	Use assertEquals instead of failUnlessEquals (for Twisted 2.0
 	compatibility).

Modified: flumotion/trunk/flumotion/test/test_comptest.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_comptest.py	(original)
+++ flumotion/trunk/flumotion/test/test_comptest.py	Mon Jul 30 18:57:21 2007
@@ -39,7 +39,20 @@
 from flumotion.component.producers.pipeline.pipeline import Producer
 from flumotion.component.converters.pipeline.pipeline import Converter
 
-class CompTestTestCase(log.Loggable, unittest.TestCase,
+class CompatTestCase(unittest.TestCase):
+    """TestCase in Twisted 2.0 doesn't define 'failUnlessFailure' method.
+
+    This class adds it, if necessary.
+    """
+    if not getattr(unittest.TestCase, 'failUnlessFailure', None):
+        try:
+            from twisted.trial import assertions
+            failUnlessFailure = lambda self, deferred, expectedFailures: \
+                assertions.failUnlessFailure(deferred, expectedFailures)
+        except ImportError:
+            pass
+
+class CompTestTestCase(log.Loggable, CompatTestCase,
                        ComponentUnitTestMixin):
     logCategory = 'comptest-test'
 
@@ -68,7 +81,7 @@
         else:
             self.failIfEquals(comptest.HAVE_GTK2REACTOR, False)
 
-class TestComponentWrapper(unittest.TestCase):
+class TestComponentWrapper(CompatTestCase):
     def test_get_unique_name(self):
         self.failIfEquals(ComponentWrapper.get_unique_name(),
                           ComponentWrapper.get_unique_name())