r12115 - /1.3/test_suite/relax_test_loader.py -- January 04, 2011 - 11:01

Author: bugman
Date: Tue Jan  4 11:01:17 2011
New Revision: 12115

URL: http://svn.gna.org/viewcvs/relax?rev=12115&view=rev
Log:
Added a replacment loadTestsFromTestCase() method to RelaxTestLoader.

This method will later be modified to skip certain tests.


Modified:
    1.3/test_suite/relax_test_loader.py

Modified: 1.3/test_suite/relax_test_loader.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/relax_test_loader.py?rev=12115&r1=12114&r2=12115&view=diff
==============================================================================
--- 1.3/test_suite/relax_test_loader.py (original)
+++ 1.3/test_suite/relax_test_loader.py Tue Jan  4 11:01:17 2011
@@ -28,8 +28,32 @@
 """
 
 # Python module imports
-from unittest import TestLoader
+from unittest import TestLoader, TestSuite
 
 
 class RelaxTestLoader(TestLoader):
     """Replacement TestLoader class."""
+
+    def loadTestsFromTestCase(self, testCaseClass):
+        """Replacement method for skipping tests."""
+
+        # A check from the original function.
+        if issubclass(testCaseClass, TestSuite):
+            raise TypeError("Test cases should not be derived from 
TestSuite. Maybe you meant to derive from TestCase?")
+
+        # Get the test names.
+        testCaseNames = self.getTestCaseNames(testCaseClass)
+
+        # Again from the original function.
+        if not testCaseNames and hasattr(testCaseClass, 'runTest'):
+            testCaseNames = ['runTest']
+
+        # Generate a list of test cases.
+        case_list = []
+        for i in range(len(testCaseNames)):
+            case_list.append(testCaseClass(testCaseNames[i]))
+
+        # Return the test suite.
+        return self.suiteClass(case_list)
+
+