Commit Graph

125 Commits

Author SHA1 Message Date
Michael Foord a74b3aa0cc Remove more Python 2 compatibility cruft from unittest.mock 2012-03-14 14:40:22 -07:00
Michael Foord ebff097937 And another one... mock import fix. 2012-03-14 13:01:31 -07:00
Michael Foord 83a16856ee Fix another mock import 2012-03-14 12:58:46 -07:00
Michael Foord 0ca9acd1dd Fix import failure in mock test 2012-03-14 12:38:06 -07:00
Michael Foord 345266aa7e PEP 417: Adding unittest.mock 2012-03-14 12:24:34 -07:00
Michael Foord 5f99ced092 Refactor unittest command line handling to always use optparse 2012-03-12 13:53:04 -07:00
Florent Xicluna c53ae58954 Drop unused import in unittest package. 2011-11-04 08:25:54 +01:00
Benjamin Peterson b6ffa7980f test that TestCase doesn't get cycles 2011-07-14 12:48:25 -05:00
Ezio Melotti b4dc2502ad Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and assertWarnsRegex now accept a keyword argument 'msg' when used as context managers. Initial patch by Winston Ewert. 2011-05-06 15:01:41 +03:00
Ezio Melotti 9490af2150 #11763: merge with 3.2. 2011-04-27 10:21:51 +03:00
Ezio Melotti edd117fd27 #11763: merge with 3.1. 2011-04-27 10:20:38 +03:00
Ezio Melotti 0f535013c5 #11282: add back the fail* methods and assertDictContainsSubset. 2011-04-03 18:02:13 +03:00
Ezio Melotti b7af620747 #11282: merge with 3.2. 2011-04-03 17:39:19 +03:00
Ezio Melotti 361467e522 #11282: the fail* methods will stay around a few more versions. 2011-04-03 17:37:58 +03:00
Ezio Melotti 45763d0d12 Merge with 3.2. 2011-03-20 15:34:28 +02:00
Ezio Melotti 60c3c9f918 Save a copy of sys.warnoptions in test_program. 2011-03-20 15:31:26 +02:00
Michael Foord 42ec7cb105 Issue #10979. unittest stdout buffering now works with class and module setup and teardown. 2011-03-17 13:44:18 -04:00
Victor Stinner 98dbba5d20 Issue #3080: Use repr() to format the module name on error 2011-03-14 15:15:47 -04:00
Michael Foord e9ff2ef204 Closes issue 10979. unittest buffering now works with class and module setup and teardown 2011-03-17 13:58:22 -04:00
Michael Foord 1341bb0019 Closes issue 11407. TestCase.run returns the result object used or created 2011-03-14 19:01:46 -04:00
Georg Brandl 2cebdd4865 Remove unittest methods scheduled for removal in 3.3 -- makes the unittest test suite pass again. 2011-02-20 11:18:09 +00:00
Victor Stinner cae969e70a fix test_unittest: ignore DeprecationWarning on assertDictContainsSubset() 2011-01-03 23:56:12 +00:00
Michael Foord 32e1d8340c Enable unittest.TestCase to be instantiated without providing a method name.
Changed unittestgui to show number of discovered tests in the status bar.
2011-01-03 17:00:11 +00:00
Michael Foord 6f17e2df29 Issue 10786: unittest.TextTestRunner default stream no longer bound at import time 2010-12-30 19:36:29 +00:00
Raymond Hettinger f954217458 Add direct tests for the util functions. 2010-12-24 10:30:06 +00:00
Raymond Hettinger 93e233d6e5 Improve diff for assertCountEqual() to actually show the differing counts.
New output looks like this:

Traceback (most recent call last):
  File "test.py", line 5, in test_ce
    self.assertCountEqual('abracadabra xx', 'simsalabim xx')
AssertionError: Element counts were not equal:
Expected 5, got 2:  'a'
Expected 2, got 1:  'b'
Expected 0, got 2:  'i'
Expected 0, got 2:  'm'
Expected 0, got 1:  'l'
Expected 0, got 2:  's'
Expected 1, got 0:  'c'
Expected 1, got 0:  'd'
Expected 2, got 0:  'r'
2010-12-24 10:02:22 +00:00
Raymond Hettinger 83961245b4 Add test for r87454. 2010-12-24 00:48:47 +00:00
Raymond Hettinger 8ebe27f300 Deprecate assertDictContainsSubset() 2010-12-21 19:24:26 +00:00
Michael Foord cca5be2e4c Improvement to fix for issue 9926 to allow TestResult to be reused. 2010-12-19 04:07:28 +00:00
Michael Foord f100dbd600 Fix minor issue in implementation of issue 10470. 2010-12-19 03:59:10 +00:00
Michael Foord b3468f79ef Issue 10611. Issue 9857. Improve the way exception handling, including test skipping, is done inside TestCase.run 2010-12-19 03:19:47 +00:00
Ezio Melotti 3044fa77a5 Use lowercase true/false in assertTrue/assertFalse messages. 2010-12-18 17:31:58 +00:00
Ezio Melotti 8f77630747 #10273: Remove a "Matches" that I missed in r86910. Thanks to RDM for noticing it. 2010-12-10 02:32:05 +00:00
Michael Foord 36526bf3d9 Correct comment in unittest test 2010-12-04 01:43:59 +00:00
Michael Foord 37d120aeb4 Issue 10620: Specifying test modules by path instead of module name to 'python -m unittest' 2010-12-04 01:11:21 +00:00
Michael Foord 5074df623b Issue 7911: unittest.TestCase.longMessage defaults to True for improved failure messages by default 2010-12-03 00:53:09 +00:00
Ezio Melotti ed3a7d2d60 #10273: Rename assertRegexpMatches and assertRaisesRegexp to assertRegex and assertRaisesRegex. 2010-12-01 02:32:32 +00:00
Ezio Melotti f10c400b91 Fix test failure in debug builds and add NEWS entry for r86908 2010-12-01 01:45:53 +00:00
Ezio Melotti 6090187656 #10535: Enable silenced warnings in unittest by default 2010-12-01 00:56:10 +00:00
Raymond Hettinger 6e165b30de Issue 10242: unittest.assertItemsEqual makes too many assumptions. 2010-11-27 09:31:37 +00:00
Ezio Melotti 2baf1a69f4 #9424: add a DeprecationWarning for assertEquals, assertNotEquals, assertAlmostEquals, assertNotAlmostEquals, and assert_ 2010-11-22 12:56:58 +00:00
Michael Foord b87ef8f872 Improve test for 'python -m unittest' launching test discovery 2010-11-22 10:41:27 +00:00
Michael Foord 086f30815c Issue 10470: 'python -m unittest' launches test discovery by default.(If you need to pass options to test discovery the discover subcommand must still be specified explicitly.) 2010-11-21 21:28:01 +00:00
Ezio Melotti b3aedd4862 #9424: Replace deprecated assert* methods in the Python test suite. 2010-11-20 19:04:17 +00:00
Michael Foord b357fb7bed Issue 10326: further extend test for unpickling to ensure type lookup mechanism works after unpickling 2010-11-20 15:47:56 +00:00
Michael Foord 8a00eec2a8 Issue 10326: extend test for pickling of TestCase instances to ensure they can be unpickled too 2010-11-20 15:43:02 +00:00
Michael Foord 8ca6d9884b Issue 10326: TestCase instances can now be pickled (they store names of instance methods instead of references to the instance methods themselves). 2010-11-20 15:34:26 +00:00
Michael Foord bbea35f194 Fix issue 9926. TestSuite subclasses that override __call__ are called correctly. 2010-11-01 21:09:03 +00:00
Antoine Pitrou 4bc12ef47d Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest
test cases now also have assertWarns and assertWarnsRegexp methods to
check that a given warning type was triggered by the code under test.
2010-09-06 19:25:46 +00:00
Michael Foord c653ce313f Fix error message for comparing single line strings in unittest.TestCase.assertEqual.
Issue 9174.
2010-07-10 13:52:22 +00:00
Michael Foord 2b293cf1a5 Merged revisions 81878 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81878 | michael.foord | 2010-06-10 21:40:21 +0100 (Thu, 10 Jun 2010) | 2 lines

  Fix issue with nested test suites debug method and module setups. (unittest)
........
2010-06-10 20:41:54 +00:00
Michael Foord b874874194 Merged revisions 81853 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81853 | michael.foord | 2010-06-08 23:44:52 +0100 (Tue, 08 Jun 2010) | 1 line

  Issue 8948. cleanup functions are not run by unittest.TestCase.debug(), plus class and module teardowns are not run by unittest.TestSuite.debug().
........
2010-06-10 16:16:08 +00:00
Michael Foord 520ed0a150 Merged revisions 81764 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81764 | michael.foord | 2010-06-05 21:59:00 +0100 (Sat, 05 Jun 2010) | 1 line

  Tests for issue 8302, skipped test in a setUpClass or a setUpModule are reported as skips rather than errors.
........
2010-06-05 21:12:23 +00:00
Michael Foord da562f65e9 Merged revisions 81763 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81763 | michael.foord | 2010-06-05 21:33:43 +0100 (Sat, 05 Jun 2010) | 1 line

  Tests for unittest.TestCase.maxDiff.
........
2010-06-05 21:01:08 +00:00
Michael Foord ac76074628 Merged revisions 81753 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81753 | michael.foord | 2010-06-05 14:48:27 +0100 (Sat, 05 Jun 2010) | 1 line

  Fix unittest tests after previous commit.
........
2010-06-05 13:57:23 +00:00
Michael Foord 085dfd3ad5 Merged revisions 81739 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81739 | michael.foord | 2010-06-05 13:10:52 +0100 (Sat, 05 Jun 2010) | 1 line

  Removed the new max_diff argument to assertSequenceEqual. All unittest.TestCase assert methods that use difflib to produce failure messages now truncate overly long messages. New class attribute unittest.TestCase.maxDiff to configure this if necessary. Issue 8351.
........
2010-06-05 12:17:02 +00:00
Michael Foord 67c399f93e Test fix to use floor division. Correction from merge in previous commit. 2010-06-05 11:30:23 +00:00
Michael Foord 2034d9a996 Merged revisions 81728 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81728 | michael.foord | 2010-06-05 12:23:51 +0100 (Sat, 05 Jun 2010) | 1 line

  Issue 8351. Suppress large diffs in unittest.TestCase.assertSequenceEqual.
........
2010-06-05 11:27:52 +00:00
Michael Foord ffa2e4ee55 Merged revisions 81022 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81022 | michael.foord | 2010-05-09 11:58:25 +0200 (Sun, 09 May 2010) | 1 line

  Adding a test for unittest.BaseTestSuite.
........
2010-05-09 09:59:35 +00:00
Michael Foord 73162197aa Merged revisions 80997 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80997 | michael.foord | 2010-05-08 19:06:25 +0200 (Sat, 08 May 2010) | 1 line

  unittest: issue 8301. Adding functions to test suites no longer crashes.
........
2010-05-08 17:10:05 +00:00
Michael Foord 161b024b6d Merged revisions 80974 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80974 | michael.foord | 2010-05-08 15:20:07 +0200 (Sat, 08 May 2010) | 1 line

  Issue 7780. Adding a test for unittest test discovery from a dotted path.
........
2010-05-08 13:23:31 +00:00
Michael Foord 3b2494f38c Merged revisions 80946 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80946 | michael.foord | 2010-05-08 01:39:38 +0200 (Sat, 08 May 2010) | 1 line

  Issue 8547 - detecting and reporting that modules have been imported from the wrong location under test discovery.
........
2010-05-07 23:42:40 +00:00
Benjamin Peterson 135d87c23c Merged revisions 80939 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80939 | benjamin.peterson | 2010-05-07 15:45:07 -0500 (Fri, 07 May 2010) | 1 line

  revert r80932; it breaks windows
........
2010-05-07 20:47:43 +00:00
Michael Foord 01984e9629 Merged revisions 80932 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80932 | michael.foord | 2010-05-07 20:16:19 +0200 (Fri, 07 May 2010) | 1 line

  Issue 8547 - detecting and reporting that modules have been imported from the wrong location under test discovery.
........
2010-05-07 18:18:14 +00:00
Michael Foord 56fdb75453 Merged revisions 80920 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80920 | michael.foord | 2010-05-07 17:52:05 +0200 (Fri, 07 May 2010) | 1 line

  Adding tests for unittest command line handling of buffer, catchbreak and failfast.
........
2010-05-07 16:00:30 +00:00
Michael Foord 4a8cf3c50b Merged revisions 80918 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80918 | michael.foord | 2010-05-07 17:34:08 +0200 (Fri, 07 May 2010) | 1 line

  Adding a test for unittest test discovery with dotted path name.
........
2010-05-07 15:35:24 +00:00
Michael Foord d23ea06175 Merged revisions 80708 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80708 | michael.foord | 2010-05-02 21:39:42 +0100 (Sun, 02 May 2010) | 1 line

  Fix unittest tests to not abuse traceback.format_exception
........
2010-05-02 21:00:22 +00:00
Michael Foord de4ceabfd8 Merged revisions 80476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80476 | michael.foord | 2010-04-25 20:02:46 +0100 (Sun, 25 Apr 2010) | 1 line

  Adding unittest.removeHandler function / decorator for removing the signal.SIGINT signal handler. With tests and docs.
........
2010-04-25 19:53:49 +00:00
R. David Murray 3141a6379b Merged revisions 80155 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80155 | r.david.murray | 2010-04-17 17:59:26 -0400 (Sat, 17 Apr 2010) | 5 lines

  Issue #8263: On freebsd6 the unittest 'break' test stops regrtest; skip it.

  This is presumably related to issue 3864, and appears to be due
  to a platform bug on freebsd6.
........
2010-04-22 00:53:47 +00:00
Brian Curtin eb24d7498f Port #1220212 (os.kill for Win32) to py3k. 2010-04-12 17:16:38 +00:00
Benjamin Peterson b48af54ff7 Merged revisions 79464,79471,79623,79626,79630,79632,79643,79648-79649,79679,79685,79711,79761,79774,79777,79792-79794,79877,79898-79900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79464 | michael.foord | 2010-03-27 07:55:19 -0500 (Sat, 27 Mar 2010) | 1 line

  A fix for running unittest tests on platforms without the audioop module (e.g. jython and IronPython)
........
  r79471 | michael.foord | 2010-03-27 14:10:11 -0500 (Sat, 27 Mar 2010) | 4 lines

  Addition of delta keyword argument to unittest.TestCase.assertAlmostEquals and assertNotAlmostEquals

  This allows the comparison of objects by specifying a maximum difference; this includes the comparing of non-numeric objects that don't support rounding.
........
  r79623 | michael.foord | 2010-04-02 16:42:47 -0500 (Fri, 02 Apr 2010) | 1 line

  Addition of -b command line option to unittest for buffering stdout and stderr during test runs.
........
  r79626 | michael.foord | 2010-04-02 17:08:29 -0500 (Fri, 02 Apr 2010) | 1 line

  TestResult stores original sys.stdout and tests no longer use sys.__stdout__ (etc) in tests for unittest -b command line option
........
  r79630 | michael.foord | 2010-04-02 17:30:56 -0500 (Fri, 02 Apr 2010) | 1 line

  unittest tests no longer replace the sys.stdout put in place by regrtest
........
  r79632 | michael.foord | 2010-04-02 17:55:59 -0500 (Fri, 02 Apr 2010) | 1 line

  Issue #8038: Addition of unittest.TestCase.assertNotRegexpMatches
........
  r79643 | michael.foord | 2010-04-02 20:15:21 -0500 (Fri, 02 Apr 2010) | 1 line

  Support dotted module names for test discovery paths in unittest. Issue 8038.
........
  r79648 | michael.foord | 2010-04-02 21:21:39 -0500 (Fri, 02 Apr 2010) | 1 line

  Cross platform unittest.TestResult newline handling when buffering stdout / stderr.
........
  r79649 | michael.foord | 2010-04-02 21:33:55 -0500 (Fri, 02 Apr 2010) | 1 line

  Another attempt at a fix for unittest.test.test_result for windows line endings
........
  r79679 | michael.foord | 2010-04-03 09:52:18 -0500 (Sat, 03 Apr 2010) | 1 line

  Adding -b command line option to the unittest usage message.
........
  r79685 | michael.foord | 2010-04-03 10:20:00 -0500 (Sat, 03 Apr 2010) | 1 line

  Minor tweak to unittest command line usage message
........
  r79711 | michael.foord | 2010-04-03 12:03:11 -0500 (Sat, 03 Apr 2010) | 1 line

  Documenting new features in unittest
........
  r79761 | michael.foord | 2010-04-04 17:41:54 -0500 (Sun, 04 Apr 2010) | 1 line

  unittest documentation formatting changes
........
  r79774 | michael.foord | 2010-04-04 18:28:44 -0500 (Sun, 04 Apr 2010) | 1 line

  Adding documentation for new unittest.main() parameters
........
  r79777 | michael.foord | 2010-04-04 19:39:50 -0500 (Sun, 04 Apr 2010) | 1 line

  Document signal handling functions in unittest.rst
........
  r79792 | michael.foord | 2010-04-05 05:26:26 -0500 (Mon, 05 Apr 2010) | 1 line

  Documentation fixes for unittest
........
  r79793 | michael.foord | 2010-04-05 05:28:27 -0500 (Mon, 05 Apr 2010) | 1 line

  Furterh documentation fix for unittest.rst
........
  r79794 | michael.foord | 2010-04-05 05:30:14 -0500 (Mon, 05 Apr 2010) | 1 line

  Further documentation fix for unittest.rst
........
  r79877 | michael.foord | 2010-04-06 18:18:16 -0500 (Tue, 06 Apr 2010) | 1 line

  Fix module directory finding logic for dotted paths in unittest test discovery.
........
  r79898 | michael.foord | 2010-04-07 18:04:22 -0500 (Wed, 07 Apr 2010) | 1 line

  unittest.result.TestResult does not create its buffers until they're used. It uses StringIO not cStringIO. Issue 8333.
........
  r79899 | michael.foord | 2010-04-07 19:04:24 -0500 (Wed, 07 Apr 2010) | 1 line

  Switch regrtest to use StringIO instead of cStringIO for test_multiprocessing on Windows. Issue 8333.
........
  r79900 | michael.foord | 2010-04-07 23:33:20 -0500 (Wed, 07 Apr 2010) | 1 line

  Correction of unittest documentation typos and omissions
........
2010-04-11 20:43:16 +00:00
Florent Xicluna fd1b0930ce Merged revisions 79297,79310,79382,79425-79427,79450 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines

  #7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.
........
  r79310 | florent.xicluna | 2010-03-22 23:52:11 +0100 (lun, 22 mar 2010) | 2 lines

  Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only).
........
  r79382 | florent.xicluna | 2010-03-24 20:33:25 +0100 (mer, 24 mar 2010) | 2 lines

  Skip tests which depend on multiprocessing.sharedctypes, if _ctypes is not available.
........
  r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines

  Syntax cleanup `== None` -> `is None`
........
  r79426 | florent.xicluna | 2010-03-25 21:33:49 +0100 (jeu, 25 mar 2010) | 2 lines

  #8207: Fix test_pep277 on OS X
........
  r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines

  Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest"
........
  r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines

  Ensure that the failed or unexpected tests are sorted before printing.
........
2010-03-28 00:25:02 +00:00
Michael Foord bf1fab4aa0 Merged revisions 79468 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79468 | michael.foord | 2010-03-27 13:42:34 +0000 (Sat, 27 Mar 2010) | 1 line

  Rename the unittest test_suite function to not clash with a test module name (unittest.test.test_suite is now unambiguous).
........
2010-03-27 13:45:04 +00:00
Michael Foord 65b69a1093 Merged revisions 79437 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79437 | michael.foord | 2010-03-26 03:18:31 +0000 (Fri, 26 Mar 2010) | 1 line

  Addition of -c command line option to unittest, to handle ctrl-c during a test run more elegantly
........
2010-03-27 13:25:41 +00:00
Michael Foord 2560e5cf53 Breaking test_unittest.py into a package. Manual merge of revision 79432. 2010-03-27 12:34:21 +00:00