Merged revisions 72905 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72905 | benjamin.peterson | 2009-05-24 19:48:58 -0500 (Sun, 24 May 2009) | 4 lines
make class skipping decorators the same as skipping every test of the class
This removes ClassTestSuite and a good bit of hacks.
........
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index abeb8a0..61883f6 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -60,8 +60,7 @@
Test suites are implemented by the :class:`TestSuite` class. This class allows
individual tests and test suites to be aggregated; when the suite is executed,
-all tests added directly to the suite and in "child" test suites are run. A
-:class:`ClassTestSuite` contains the test cases of a class.
+all tests added directly to the suite and in "child" test suites are run.
A test runner is an object that provides a single method,
:meth:`~TestRunner.run`, which accepts a :class:`TestCase` or :class:`TestSuite`
@@ -1032,11 +1031,10 @@
test suites that will be used to build the suite initially. Additional methods
are provided to add test cases and suites to the collection later on.
- :class:`TestSuite` (including :class:`ClassTestSuite`) objects behave much
- like :class:`TestCase` objects, except they do not actually implement a test.
- Instead, they are used to aggregate tests into groups of tests that should be
- run together. Some additional methods are available to add tests to
- :class:`TestSuite` instances:
+ :class:`TestSuite` objects behave much like :class:`TestCase` objects, except
+ they do not actually implement a test. Instead, they are used to aggregate
+ tests into groups of tests that should be run together. Some additional
+ methods are available to add tests to :class:`TestSuite` instances:
.. method:: TestSuite.addTest(test)
@@ -1093,14 +1091,6 @@
is invoked by a :class:`TestRunner` rather than by the end-user test harness.
-.. class:: ClassTestSuite(tests, collected_from)
-
- This subclass of :class:`TestSuite` repesents an aggregation of individuals
- tests from one :class:`TestCase` class. *tests* is an iterable of
- :class:`TestCase` instances created from the class. *collected_from* is the
- class they came from.
-
-
Loading and running tests
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1202,12 +1192,6 @@
This affects all the :meth:`loadTestsFrom\*` methods.
- .. attribute:: classSuiteClass
-
- Callable object that constructs a test suite for the tests cases from one
- class. The default value is :class:`ClassTestSuite`.
-
-
.. class:: TestResult
This class is used to compile information about which tests have succeeded