summaryrefslogtreecommitdiff
path: root/Lib/unittest
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-18 12:11:12 +0000
committerMartin Panter <vadmium+py@gmail.com>2017-01-18 12:11:12 +0000
commit97610f3531cc912b1efe50791ab64aff537d0656 (patch)
treefb2f25118b080343d4cc75b02d6a98ecd7d5da52 /Lib/unittest
parenta350668de75435526c63a5671a892f72a6cd70fb (diff)
parent500f3d1a3081681b2042a2b2d33eb5fa62cd42ba (diff)
downloadcpython-97610f3531cc912b1efe50791ab64aff537d0656.tar.gz
Issue 29274: Merge doc fixes from 3.5
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/loader.py8
-rw-r--r--Lib/unittest/test/test_loader.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index eb447d7ab6..e860debc0f 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -81,7 +81,7 @@ class TestLoader(object):
self._loading_packages = set()
def loadTestsFromTestCase(self, testCaseClass):
- """Return a suite of all tests cases contained in testCaseClass"""
+ """Return a suite of all test cases contained in testCaseClass"""
if issubclass(testCaseClass, suite.TestSuite):
raise TypeError("Test cases should not be derived from "
"TestSuite. Maybe you meant to derive from "
@@ -95,7 +95,7 @@ class TestLoader(object):
# XXX After Python 3.5, remove backward compatibility hacks for
# use_load_tests deprecation via *args and **kws. See issue 16662.
def loadTestsFromModule(self, module, *args, pattern=None, **kws):
- """Return a suite of all tests cases contained in the given module"""
+ """Return a suite of all test cases contained in the given module"""
# This method used to take an undocumented and unofficial
# use_load_tests argument. For backward compatibility, we still
# accept the argument (which can also be the first position) but we
@@ -135,7 +135,7 @@ class TestLoader(object):
return tests
def loadTestsFromName(self, name, module=None):
- """Return a suite of all tests cases given a string specifier.
+ """Return a suite of all test cases given a string specifier.
The name may resolve either to a module, a test case class, a
test method within a test case class, or a callable object which
@@ -213,7 +213,7 @@ class TestLoader(object):
raise TypeError("don't know how to make test from: %s" % obj)
def loadTestsFromNames(self, names, module=None):
- """Return a suite of all tests cases found using the given sequence
+ """Return a suite of all test cases found using the given sequence
of string specifiers. See 'loadTestsFromName()'.
"""
suites = [self.loadTestsFromName(name, module) for name in names]
diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py
index b2f9c882cf..1131a755ea 100644
--- a/Lib/unittest/test/test_loader.py
+++ b/Lib/unittest/test/test_loader.py
@@ -35,7 +35,7 @@ class Test_TestLoader(unittest.TestCase):
### Tests for TestLoader.loadTestsFromTestCase
################################################################
- # "Return a suite of all tests cases contained in the TestCase-derived
+ # "Return a suite of all test cases contained in the TestCase-derived
# class testCaseClass"
def test_loadTestsFromTestCase(self):
class Foo(unittest.TestCase):
@@ -48,7 +48,7 @@ class Test_TestLoader(unittest.TestCase):
loader = unittest.TestLoader()
self.assertEqual(loader.loadTestsFromTestCase(Foo), tests)
- # "Return a suite of all tests cases contained in the TestCase-derived
+ # "Return a suite of all test cases contained in the TestCase-derived
# class testCaseClass"
#
# Make sure it does the right thing even if no tests were found
@@ -61,7 +61,7 @@ class Test_TestLoader(unittest.TestCase):
loader = unittest.TestLoader()
self.assertEqual(loader.loadTestsFromTestCase(Foo), empty_suite)
- # "Return a suite of all tests cases contained in the TestCase-derived
+ # "Return a suite of all test cases contained in the TestCase-derived
# class testCaseClass"
#
# What happens if loadTestsFromTestCase() is given an object
@@ -82,7 +82,7 @@ class Test_TestLoader(unittest.TestCase):
else:
self.fail('Should raise TypeError')
- # "Return a suite of all tests cases contained in the TestCase-derived
+ # "Return a suite of all test cases contained in the TestCase-derived
# class testCaseClass"
#
# Make sure loadTestsFromTestCase() picks up the default test method