Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 847a411

Browse files
committed
Merged revisions 78227,78229,78288,78348,78377,78770,78774-78776,78810 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r78227 | michael.foord | 2010-02-18 14:30:09 -0600 (Thu, 18 Feb 2010) | 1 line unittest.TestCase uses safe_repr for producing failure messages. Partial fix for issue 7956 ........ r78229 | michael.foord | 2010-02-18 15:37:07 -0600 (Thu, 18 Feb 2010) | 1 line Fix unittest.TestCase.assertDictContainsSubset so it can't die with unicode issues when constructing failure messages. Issue 7956 ........ r78288 | michael.foord | 2010-02-21 08:48:59 -0600 (Sun, 21 Feb 2010) | 1 line Silence UnicodeWarning in crazy unittest test. ........ r78348 | michael.foord | 2010-02-22 17:28:32 -0600 (Mon, 22 Feb 2010) | 1 line Support for old TestResult object (unittest) with warnings when using unsupported features. ........ r78377 | michael.foord | 2010-02-23 11:00:53 -0600 (Tue, 23 Feb 2010) | 1 line unittest.TestResult can now be used with the TextTestRunner. TextTestRunner compatible with old TestResult objects. ........ r78770 | michael.foord | 2010-03-07 14:22:12 -0600 (Sun, 07 Mar 2010) | 1 line Fix for potentials errors in constructing unittest failure messages. Plus skipped test methods no longer run setUp and tearDown (Issue 8059) ........ r78774 | michael.foord | 2010-03-07 16:04:55 -0600 (Sun, 07 Mar 2010) | 1 line Addition of setUpClass and setUpModule shared fixtures to unittest. ........ r78775 | michael.foord | 2010-03-07 17:10:36 -0600 (Sun, 07 Mar 2010) | 1 line Fix accidental name rebinding in unittest py3k warning filtering. ........ r78776 | michael.foord | 2010-03-07 17:16:20 -0600 (Sun, 07 Mar 2010) | 1 line Remove accidental print statement from last commit. ........ r78810 | raymond.hettinger | 2010-03-09 02:44:18 -0600 (Tue, 09 Mar 2010) | 5 lines Improve the basic example. * Show both the decorator and regular form for assertRaises() * Use assertTrue() instead of assertIn() to teach useful minimal subset of the API ........
1 parent 3b8bfef commit 847a411

8 files changed

Lines changed: 865 additions & 94 deletions

File tree

Doc/library/unittest.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,18 @@ Here is a short script to test three functions from the :mod:`random` module::
177177
self.seq.sort()
178178
self.assertEqual(self.seq, list(range(10)))
179179

180+
# should raise an exception for an immutable sequence
181+
self.assertRaises(TypeError, random.shuffle, (1,2,3))
182+
180183
def test_choice(self):
181184
element = random.choice(self.seq)
182-
self.assertIn(element, self.seq)
185+
self.assertTrue(element in self.seq)
183186

184187
def test_sample(self):
185-
self.assertRaises(ValueError, random.sample, self.seq, 20)
188+
with self.assertRaises(ValueError):
189+
random.sample(self.seq, 20)
186190
for element in random.sample(self.seq, 5):
187-
self.assertIn(element, self.seq)
191+
self.assertTrue(element in self.seq)
188192

189193
if __name__ == '__main__':
190194
unittest.main()

0 commit comments

Comments
 (0)