[Python-checkins] r74385 - in python/branches/release31-maint: Lib/ctypes/test/test_internals.py Lib/test/support.py Lib/test/test_logging.py Lib/test/test_unittest.py

georg.brandl python-checkins at python.org
Thu Aug 13 10:52:54 CEST 2009

• Previous message: [Python-checkins] r74384 - in python/branches/release31-maint: Lib/ctypes/test/test_anon.py Lib/ctypes/test/test_array_in_pointer.py Lib/ctypes/test/test_arrays.py Lib/ctypes/test/test_as_parameter.py Lib/ctypes/test/test_bitfields.py Lib/ctypes/test/test_buffers.py Lib/ctypes/test/test_byteswap.py Lib/ctypes/test/test_callbacks.py Lib/ctypes/test/test_cast.py Lib/ctypes/test/test_cfuncs.py Lib/ctypes/test/test_checkretval.py Lib/ctypes/test/test_errno.py Lib/ctypes/test/test_find.py Lib/ctypes/test/test_frombuffer.py Lib/ctypes/test/test_funcptr.py Lib/ctypes/test/test_functions.py Lib/ctypes/test/test_incomplete.py Lib/ctypes/test/test_init.py Lib/ctypes/test/test_internals.py Lib/ctypes/test/test_keeprefs.py Lib/ctypes/test/test_libc.py Lib/ctypes/test/test_loading.py Lib/ctypes/test/test_macholib.py Lib/ctypes/test/test_memfunctions.py Lib/ctypes/test/test_numbers.py Lib/ctypes/test/test_parameters.py Lib/ctypes/test/test_pep3118.py Lib/ctypes/test/test_pickling.py Lib/ctypes/test/test_pointers.py Lib/ctypes/test/test_prototypes.py Lib/ctypes/test/test_python_api.py Lib/ctypes/test/test_random_things.py Lib/ctypes/test/test_refcounts.py Lib/ctypes/test/test_repr.py Lib/ctypes/test/test_returnfuncptrs.py Lib/ctypes/test/test_simplesubclasses.py Lib/ctypes/test/test_sizes.py Lib/ctypes/test/test_slicing.py Lib/ctypes/test/test_stringptr.py Lib/ctypes/test/test_strings.py Lib/ctypes/test/test_struct_fields.py Lib/ctypes/test/test_structures.py Lib/ctypes/test/test_unaligned_structures.py Lib/ctypes/test/test_unicode.py Lib/ctypes/test/test_values.py Lib/ctypes/test/test_varsize_struct.py Lib/ctypes/test/test_win32.py Lib/distutils/tests/test_archive_util.py Lib/distutils/tests/test_bdist_rpm.py Lib/distutils/tests/test_bdist_wininst.py Lib/distutils/tests/test_build_clib.py Lib/distutils/tests/test_build_ext.py Lib/distutils/tests/test_build_py.py Lib/distutils/tests/test_build_scripts.py Lib/distutils/tests/test_clean.py Lib/distutils/tests/test_cmd.py Lib/distutils/tests/test_config.py Lib/distutils/tests/test_config_cmd.py Lib/distutils/tests/test_dist.py Lib/distutils/tests/test_install.py Lib/distutils/tests/test_install_data.py Lib/distutils/tests/test_install_lib.py Lib/distutils/tests/test_install_scripts.py Lib/distutils/tests/test_msvc9compiler.py Lib/distutils/tests/test_register.py Lib/distutils/tests/test_sysconfig.py Lib/distutils/tests/test_upload.py Lib/distutils/tests/test_util.py Lib/email/test/test_email.py Lib/importlib/test/builtin/test_finder.py Lib/importlib/test/builtin/test_loader.py Lib/importlib/test/extension/test_finder.py Lib/importlib/test/extension/test_loader.py Lib/importlib/test/extension/test_path_hook.py Lib/importlib/test/frozen/test_finder.py Lib/importlib/test/frozen/test_loader.py Lib/importlib/test/import_/test_caching.py Lib/importlib/test/import_/test_fromlist.py Lib/importlib/test/import_/test_meta_path.py Lib/importlib/test/import_/test_packages.py Lib/importlib/test/import_/test_path.py Lib/importlib/test/import_/test_relative_imports.py Lib/importlib/test/source/test_abc_loader.py Lib/importlib/test/source/test_file_loader.py Lib/importlib/test/source/test_finder.py Lib/importlib/test/source/test_path_hook.py Lib/importlib/test/test_util.py Lib/json/tests/test_decode.py Lib/json/tests/test_speedups.py Lib/test/mapping_tests.py Lib/test/pickletester.py Lib/test/test___all__.py Lib/test/test___future__.py Lib/test/test_abc.py Lib/test/test_abstract_numbers.py Lib/test/test_array.py Lib/test/test_ast.py Lib/test/test_augassign.py Lib/test/test_base64.py Lib/test/test_bigmem.py Lib/test/test_binascii.py Lib/test/test_binop.py Lib/test/test_bisect.py Lib/test/test_bool.py Lib/test/test_bufio.py Lib/test/test_builtin.py Lib/test/test_bytes.py Lib/test/test_capi.py Lib/test/test_cfgparser.py Lib/test/test_cgi.py Lib/test/test_cmath.py Lib/test/test_cmd_line.py Lib/test/test_cmd_line_script.py Lib/test/test_codecs.py Lib/test/test_codeop.py Lib/test/test_collections.py Lib/test/test_compile.py Lib/test/test_complex.py Lib/test/test_contains.py Lib/test/test_contextlib.py Lib/test/test_copy.py Lib/test/test_copyreg.py Lib/test/test_csv.py Lib/test/test_datetime.py Lib/test/test_dbm.py Lib/test/test_dbm_dumb.py Lib/test/test_dbm_gnu.py Lib/test/test_dbm_ndbm.py Lib/test/test_decimal.py Lib/test/test_defaultdict.py Lib/test/test_deque.py Lib/test/test_descr.py Lib/test/test_dict.py Lib/test/test_dictviews.py Lib/test/test_docxmlrpc.py Lib/test/test_dummy_thread.py Lib/test/test_epoll.py Lib/test/test_errno.py Lib/test/test_exceptions.py Lib/test/test_file.py Lib/test/test_filecmp.py Lib/test/test_fileinput.py Lib/test/test_fileio.py Lib/test/test_float.py Lib/test/test_fnmatch.py Lib/test/test_ftplib.py Lib/test/test_funcattrs.py Lib/test/test_functools.py Lib/test/test_genericpath.py Lib/test/test_getargs2.py Lib/test/test_getopt.py Lib/test/test_gettext.py Lib/test/test_grammar.py Lib/test/test_grp.py Lib/test/test_gzip.py Lib/test/test_hash.py Lib/test/test_hashlib.py Lib/test/test_heapq.py Lib/test/test_hmac.py Lib/test/test_http_cookiejar.py Lib/test/test_httplib.py Lib/test/test_httpservers.py Lib/test/test_imp.py Lib/test/test_import.py Lib/test/test_importhooks.py Lib/test/test_index.py Lib/test/test_inspect.py Lib/test/test_int.py Lib/test/test_io.py Lib/test/test_ioctl.py Lib/test/test_iter.py Lib/test/test_itertools.py Lib/test/test_kqueue.py Lib/test/test_largefile.py Lib/test/test_list.py Lib/test/test_logging.py Lib/test/test_long.py Lib/test/test_macpath.py Lib/test/test_mailbox.py Lib/test/test_math.py Lib/test/test_memoryio.py Lib/test/test_memoryview.py Lib/test/test_mimetypes.py Lib/test/test_minidom.py Lib/test/test_mmap.py Lib/test/test_module.py Lib/test/test_modulefinder.py Lib/test/test_multibytecodec.py Lib/test/test_multibytecodec_support.py Lib/test/test_netrc.py Lib/test/test_normalization.py Lib/test/test_opcodes.py Lib/test/test_operator.py Lib/test/test_optparse.py Lib/test/test_os.py Lib/test/test_ossaudiodev.py Lib/test/test_parser.py Lib/test/test_peepholer.py Lib/test/test_pep247.py Lib/test/test_pep277.py Lib/test/test_pep3120.py Lib/test/test_pep352.py Lib/test/test_pkg.py Lib/test/test_pkgimport.py Lib/test/test_platform.py Lib/test/test_poplib.py Lib/test/test_posix.py Lib/test/test_posixpath.py Lib/test/test_pprint.py Lib/test/test_property.py Lib/test/test_pwd.py Lib/test/test_pyclbr.py Lib/test/test_pydoc.py Lib/test/test_queue.py Lib/test/test_raise.py Lib/test/test_random.py Lib/test/test_range.py Lib/test/test_re.py Lib/test/test_reprlib.py Lib/test/test_richcmp.py Lib/test/test_robotparser.py Lib/test/test_runpy.py Lib/test/test_scope.py Lib/test/test_set.py Lib/test/test_shutil.py Lib/test/test_signal.py Lib/test/test_site.py Lib/test/test_slice.py Lib/test/test_socket.py Lib/test/test_stringprep.py Lib/test/test_strptime.py Lib/test/test_struct.py Lib/test/test_structseq.py Lib/test/test_subprocess.py Lib/test/test_symtable.py Lib/test/test_sys.py Lib/test/test_tarfile.py Lib/test/test_tempfile.py Lib/test/test_threading.py Lib/test/test_threading_local.py Lib/test/test_time.py Lib/test/test_timeout.py Lib/test/test_tokenize.py Lib/test/test_traceback.py Lib/test/test_tuple.py Lib/test/test_types.py Lib/test/test_unary.py Lib/test/test_unicode.py Lib/test/test_unicode_file.py Lib/test/test_unicodedata.py Lib/test/test_urllib.py Lib/test/test_urllib2.py Lib/test/test_urllib2_localnet.py Lib/test/test_urllib2net.py Lib/test/test_urllibnet.py Lib/test/test_userdict.py Lib/test/test_uuid.py Lib/test/test_warnings.py Lib/test/test_weakref.py Lib/test/test_weakset.py Lib/test/test_winreg.py Lib/test/test_wsgiref.py Lib/test/test_xdrlib.py Lib/test/test_xmlrpc.py Lib/test/test_xmlrpc_net.py Lib/test/test_zipfile.py Lib/test/test_zipimport.py Lib/test/test_zipimport_support.py Lib/test/test_zlib.py Lib/tkinter/test/test_tkinter/test_text.py Lib/tkinter/test/test_ttk/test_extensions.py Lib/tkinter/test/test_ttk/test_functions.py Lib/tkinter/test/test_ttk/test_style.py Lib/tkinter/test/test_ttk/test_widgets.py
• Next message: [Python-checkins] r74386 - python/branches/release31-maint
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

Author: georg.brandl
Date: Thu Aug 13 10:52:53 2009
New Revision: 74385
Log:
Merged revisions 73718,73721,73723 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k
................
 r73718 | benjamin.peterson | 2009年07月01日 01:35:19 +0200 (Mi, 01 Jul 2009) | 9 lines
 
 Merged revisions 73717 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r73717 | benjamin.peterson | 2009年06月30日 18:30:12 -0500 (2009年6月30日) | 1 line
 
 use assert* methods in test_unittest
 ........
................
 r73721 | benjamin.peterson | 2009年07月01日 02:43:10 +0200 (Mi, 01 Jul 2009) | 11 lines
 
 Merged revisions 73720 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r73720 | benjamin.peterson | 2009年06月30日 19:36:41 -0500 (2009年6月30日) | 4 lines
 
 fix a few cases where automated fail -> assert translation messed up
 
 Thanks Joe Amenta
 ........
................
 r73723 | benjamin.peterson | 2009年07月01日 02:45:43 +0200 (Mi, 01 Jul 2009) | 1 line
 
 remove use of failIf
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/ctypes/test/test_internals.py
 python/branches/release31-maint/Lib/test/support.py
 python/branches/release31-maint/Lib/test/test_logging.py
 python/branches/release31-maint/Lib/test/test_unittest.py
Modified: python/branches/release31-maint/Lib/ctypes/test/test_internals.py
==============================================================================
--- python/branches/release31-maint/Lib/ctypes/test/test_internals.py	(original)
+++ python/branches/release31-maint/Lib/ctypes/test/test_internals.py	Thu Aug 13 10:52:53 2009
@@ -18,7 +18,7 @@
 """
 
 class ObjectsTestCase(unittest.TestCase):
- def assertTrueSame(self, a, b):
+ def assertSame(self, a, b):
 self.assertEqual(id(a), id(b))
 
 def test_ints(self):
@@ -33,7 +33,7 @@
 rc = grc(s)
 cs = c_char_p(s)
 self.assertEqual(rc + 1, grc(s))
- self.assertTrueSame(cs._objects, s)
+ self.assertSame(cs._objects, s)
 
 def test_simple_struct(self):
 class X(Structure):
Modified: python/branches/release31-maint/Lib/test/support.py
==============================================================================
--- python/branches/release31-maint/Lib/test/support.py	(original)
+++ python/branches/release31-maint/Lib/test/support.py	Thu Aug 13 10:52:53 2009
@@ -731,7 +731,7 @@
 # to make sure they work. We still want to avoid using
 # too much memory, though, but we do that noisily.
 maxsize = 5147
- self.failIf(maxsize * memuse + overhead > 20 * _1M)
+ self.assertFalse(maxsize * memuse + overhead > 20 * _1M)
 else:
 maxsize = int((max_memuse - overhead) / memuse)
 if maxsize < minsize:
Modified: python/branches/release31-maint/Lib/test/test_logging.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_logging.py	(original)
+++ python/branches/release31-maint/Lib/test/test_logging.py	Thu Aug 13 10:52:53 2009
@@ -99,7 +99,7 @@
 finally:
 logging._releaseLock()
 
- def assertTruelog_lines(self, expected_values, stream=None):
+ def assert_log_lines(self, expected_values, stream=None):
 """Match the collected log lines against the regular expression
 self.expected_log_pat, and compare the extracted group values to
 the expected_values list of tuples."""
@@ -165,7 +165,7 @@
 
 INF.debug(m())
 
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('ERR', 'CRITICAL', '1'),
 ('ERR', 'ERROR', '2'),
 ('INF', 'CRITICAL', '3'),
@@ -197,7 +197,7 @@
 INF_ERR.info(m())
 INF_ERR.debug(m())
 
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('INF.ERR', 'CRITICAL', '1'),
 ('INF.ERR', 'ERROR', '2'),
 ])
@@ -228,7 +228,7 @@
 INF_ERR_UNDEF.info(m())
 INF_ERR_UNDEF.debug(m())
 
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('INF.UNDEF', 'CRITICAL', '1'),
 ('INF.UNDEF', 'ERROR', '2'),
 ('INF.UNDEF', 'WARNING', '3'),
@@ -256,7 +256,7 @@
 GRANDCHILD.debug(m())
 CHILD.debug(m())
 
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('INF.BADPARENT.UNDEF', 'CRITICAL', '1'),
 ('INF.BADPARENT.UNDEF', 'INFO', '2'),
 ('INF.BADPARENT', 'CRITICAL', '3'),
@@ -285,7 +285,7 @@
 spam_eggs_fish.info(self.next_message()) # Good.
 spam_bakedbeans.info(self.next_message())
 
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('spam.eggs', 'INFO', '2'),
 ('spam.eggs.fish', 'INFO', '3'),
 ])
@@ -367,7 +367,7 @@
 self.root_logger.setLevel(VERBOSE)
 # Levels >= 'Verbose' are good.
 self.log_at_all_levels(self.root_logger)
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('Verbose', '5'),
 ('Sociable', '6'),
 ('Effusive', '7'),
@@ -382,7 +382,7 @@
 try:
 # Levels >= 'Sociable' are good.
 self.log_at_all_levels(self.root_logger)
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('Sociable', '6'),
 ('Effusive', '7'),
 ('Terse', '8'),
@@ -413,12 +413,12 @@
 ('Taciturn', '9'),
 ('Silent', '10'),
 ]
- self.assertTruelog_lines(first_lines)
+ self.assert_log_lines(first_lines)
 
 specific_filter = VerySpecificFilter()
 self.root_logger.addFilter(specific_filter)
 self.log_at_all_levels(self.root_logger)
- self.assertTruelog_lines(first_lines + [
+ self.assert_log_lines(first_lines + [
 # Not only 'Garrulous' is still missing, but also 'Sociable'
 # and 'Taciturn'
 ('Boring', '11'),
@@ -458,9 +458,9 @@
 # The memory handler flushes to its target handler based on specific
 # criteria (message count and message level).
 self.mem_logger.debug(self.next_message())
- self.assertTruelog_lines([])
+ self.assert_log_lines([])
 self.mem_logger.info(self.next_message())
- self.assertTruelog_lines([])
+ self.assert_log_lines([])
 # This will flush because the level is >= logging.WARNING
 self.mem_logger.warn(self.next_message())
 lines = [
@@ -468,19 +468,19 @@
 ('INFO', '2'),
 ('WARNING', '3'),
 ]
- self.assertTruelog_lines(lines)
+ self.assert_log_lines(lines)
 for n in (4, 14):
 for i in range(9):
 self.mem_logger.debug(self.next_message())
- self.assertTruelog_lines(lines)
+ self.assert_log_lines(lines)
 # This will flush because it's the 10th message since the last
 # flush.
 self.mem_logger.debug(self.next_message())
 lines = lines + [('DEBUG', str(i)) for i in range(n, n + 10)]
- self.assertTruelog_lines(lines)
+ self.assert_log_lines(lines)
 
 self.mem_logger.debug(self.next_message())
- self.assertTruelog_lines(lines)
+ self.assert_log_lines(lines)
 
 
 class ExceptionFormatter(logging.Formatter):
@@ -650,11 +650,11 @@
 logger.info(self.next_message())
 # Outputs a message
 logger.error(self.next_message())
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('ERROR', '2'),
 ], stream=output)
 # Original logger output is empty.
- self.assertTruelog_lines([])
+ self.assert_log_lines([])
 
 def test_config1_ok(self, config=config1):
 # A config file defining a sub-parser as well.
@@ -664,12 +664,12 @@
 # Both will output a message
 logger.info(self.next_message())
 logger.error(self.next_message())
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('INFO', '1'),
 ('ERROR', '2'),
 ], stream=output)
 # Original logger output is empty.
- self.assertTruelog_lines([])
+ self.assert_log_lines([])
 
 def test_config2_failure(self):
 # A simple config file which overrides the default settings.
@@ -692,7 +692,7 @@
 self.assertEquals(output.getvalue(),
 "ERROR:root:just testing\nGot a [RuntimeError]\n")
 # Original logger output is empty
- self.assertTruelog_lines([])
+ self.assert_log_lines([])
 
 def test_config5_ok(self):
 self.test_config1_ok(config=self.config5)
@@ -847,7 +847,7 @@
 foo.setLevel(logging.DEBUG)
 self.root_logger.debug(self.next_message())
 foo.debug(self.next_message())
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('foo', 'DEBUG', '2'),
 ])
 del foo
@@ -856,7 +856,7 @@
 # foo has retained its settings.
 bar = logging.getLogger("foo")
 bar.debug(self.next_message())
- self.assertTruelog_lines([
+ self.assert_log_lines([
 ('foo', 'DEBUG', '2'),
 ('foo', 'DEBUG', '3'),
 ])
Modified: python/branches/release31-maint/Lib/test/test_unittest.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_unittest.py	(original)
+++ python/branches/release31-maint/Lib/test/test_unittest.py	Thu Aug 13 10:52:53 2009
@@ -75,8 +75,8 @@
 # Check for a valid __ne__ implementation
 def test_ne(self):
 for obj_1, obj_2 in self.ne_pairs:
- self.failIfEqual(obj_1, obj_2)
- self.failIfEqual(obj_2, obj_1)
+ self.assertNotEqual(obj_1, obj_2)
+ self.assertNotEqual(obj_2, obj_1)
 
 class TestHashing(object):
 """Used as a mixin for TestCase"""
@@ -178,10 +178,10 @@
 
 loader = unittest.TestLoader()
 # This has to be false for the test to succeed
- self.failIf('runTest'.startswith(loader.testMethodPrefix))
+ self.assertFalse('runTest'.startswith(loader.testMethodPrefix))
 
 suite = loader.loadTestsFromTestCase(Foo)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [Foo('runTest')])
 
 ################################################################
@@ -200,7 +200,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromModule(m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 expected = [loader.suiteClass([MyTestCase('test')])]
 self.assertEqual(list(suite), expected)
@@ -213,7 +213,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromModule(m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [])
 
 # "This method searches `module` for classes derived from TestCase"
@@ -227,7 +227,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromModule(m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 self.assertEqual(list(suite), [loader.suiteClass()])
 
@@ -439,7 +439,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromName('testcase_1', m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [MyTestCase('test')])
 
 # "The specifier name is a ``dotted name'' that may resolve either to
@@ -455,7 +455,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromName('testsuite', m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 self.assertEqual(list(suite), [MyTestCase('test')])
 
@@ -470,7 +470,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromName('testcase_1.test', m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 self.assertEqual(list(suite), [MyTestCase('test')])
 
@@ -509,7 +509,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromName('return_TestSuite', m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [testcase_1, testcase_2])
 
 # "The specifier name is a ``dotted name'' that may resolve ... to
@@ -523,7 +523,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromName('return_TestCase', m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [testcase_1])
 
 # "The specifier name is a ``dotted name'' that may resolve ... to
@@ -562,11 +562,11 @@
 try:
 suite = loader.loadTestsFromName(module_name)
 
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [])
 
 # audioop should now be loaded, thanks to loadTestsFromName()
- self.failUnless(module_name in sys.modules)
+ self.assertTrue(module_name in sys.modules)
 finally:
 if module_name in sys.modules:
 del sys.modules[module_name]
@@ -585,7 +585,7 @@
 loader = unittest.TestLoader()
 
 suite = loader.loadTestsFromNames([])
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [])
 
 # "Similar to loadTestsFromName(), but takes a sequence of names rather
@@ -600,7 +600,7 @@
 loader = unittest.TestLoader()
 
 suite = loader.loadTestsFromNames([], unittest)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [])
 
 # "The specifier name is a ``dotted name'' that may resolve either to
@@ -801,7 +801,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromNames(['testcase_1'], m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 expected = loader.suiteClass([MyTestCase('test')])
 self.assertEqual(list(suite), [expected])
@@ -817,7 +817,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromNames(['testsuite'], m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 self.assertEqual(list(suite), [m.testsuite])
 
@@ -832,7 +832,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromNames(['testcase_1.test'], m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 ref_suite = unittest.TestSuite([MyTestCase('test')])
 self.assertEqual(list(suite), [ref_suite])
@@ -869,7 +869,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromNames(['return_TestSuite'], m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 expected = unittest.TestSuite([testcase_1, testcase_2])
 self.assertEqual(list(suite), [expected])
@@ -885,7 +885,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromNames(['return_TestCase'], m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 ref_suite = unittest.TestSuite([testcase_1])
 self.assertEqual(list(suite), [ref_suite])
@@ -909,7 +909,7 @@
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromNames(['Foo.foo'], m)
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 
 ref_suite = unittest.TestSuite([testcase_1])
 self.assertEqual(list(suite), [ref_suite])
@@ -950,11 +950,11 @@
 try:
 suite = loader.loadTestsFromNames([module_name])
 
- self.failUnless(isinstance(suite, loader.suiteClass))
+ self.assertTrue(isinstance(suite, loader.suiteClass))
 self.assertEqual(list(suite), [unittest.TestSuite()])
 
 # audioop should now be loaded, thanks to loadTestsFromName()
- self.failUnless(module_name in sys.modules)
+ self.assertTrue(module_name in sys.modules)
 finally:
 if module_name in sys.modules:
 del sys.modules[module_name]
@@ -1325,7 +1325,7 @@
 # "The default value is the TestSuite class"
 def test_suiteClass__default_value(self):
 loader = unittest.TestLoader()
- self.failUnless(loader.suiteClass is unittest.TestSuite)
+ self.assertTrue(loader.suiteClass is unittest.TestSuite)
 
 ################################################################
 ### /Tests for TestLoader.suiteClass
@@ -1738,7 +1738,7 @@
 def test_id(self):
 test = unittest.FunctionTestCase(lambda: None)
 
- self.failUnless(isinstance(test.id(), str))
+ self.assertTrue(isinstance(test.id(), str))
 
 # "Returns a one-line description of the test, or None if no description
 # has been provided. The default implementation of this method returns
@@ -1770,7 +1770,7 @@
 def test_init(self):
 result = unittest.TestResult()
 
- self.failUnless(result.wasSuccessful())
+ self.assertTrue(result.wasSuccessful())
 self.assertEqual(len(result.errors), 0)
 self.assertEqual(len(result.failures), 0)
 self.assertEqual(result.testsRun, 0)
@@ -1799,7 +1799,7 @@
 
 result.startTest(test)
 
- self.failUnless(result.wasSuccessful())
+ self.assertTrue(result.wasSuccessful())
 self.assertEqual(len(result.errors), 0)
 self.assertEqual(len(result.failures), 0)
 self.assertEqual(result.testsRun, 1)
@@ -1820,7 +1820,7 @@
 
 result.startTest(test)
 
- self.failUnless(result.wasSuccessful())
+ self.assertTrue(result.wasSuccessful())
 self.assertEqual(len(result.errors), 0)
 self.assertEqual(len(result.failures), 0)
 self.assertEqual(result.testsRun, 1)
@@ -1829,7 +1829,7 @@
 result.stopTest(test)
 
 # Same tests as above; make sure nothing has changed
- self.failUnless(result.wasSuccessful())
+ self.assertTrue(result.wasSuccessful())
 self.assertEqual(len(result.errors), 0)
 self.assertEqual(len(result.failures), 0)
 self.assertEqual(result.testsRun, 1)
@@ -1873,7 +1873,7 @@
 result.addSuccess(test)
 result.stopTest(test)
 
- self.failUnless(result.wasSuccessful())
+ self.assertTrue(result.wasSuccessful())
 self.assertEqual(len(result.errors), 0)
 self.assertEqual(len(result.failures), 0)
 self.assertEqual(result.testsRun, 1)
@@ -1918,15 +1918,15 @@
 result.addFailure(test, exc_info_tuple)
 result.stopTest(test)
 
- self.failIf(result.wasSuccessful())
+ self.assertFalse(result.wasSuccessful())
 self.assertEqual(len(result.errors), 0)
 self.assertEqual(len(result.failures), 1)
 self.assertEqual(result.testsRun, 1)
 self.assertEqual(result.shouldStop, False)
 
 test_case, formatted_exc = result.failures[0]
- self.failUnless(test_case is test)
- self.failUnless(isinstance(formatted_exc, str))
+ self.assertTrue(test_case is test)
+ self.assertTrue(isinstance(formatted_exc, str))
 
 # "addError(test, err)"
 # ...
@@ -1968,15 +1968,15 @@
 result.addError(test, exc_info_tuple)
 result.stopTest(test)
 
- self.failIf(result.wasSuccessful())
+ self.assertFalse(result.wasSuccessful())
 self.assertEqual(len(result.errors), 1)
 self.assertEqual(len(result.failures), 0)
 self.assertEqual(result.testsRun, 1)
 self.assertEqual(result.shouldStop, False)
 
 test_case, formatted_exc = result.errors[0]
- self.failUnless(test_case is test)
- self.failUnless(isinstance(formatted_exc, str))
+ self.assertTrue(test_case is test)
+ self.assertTrue(isinstance(formatted_exc, str))
 
 ### Support code for Test_TestCase
 ################################################################
@@ -2290,7 +2290,7 @@
 def test(self):
 pass
 
- self.failUnless(Foo('test').failureException is AssertionError)
+ self.assertTrue(Foo('test').failureException is AssertionError)
 
 # "This class attribute gives the exception raised by the test() method.
 # If a test framework needs to use a specialized exception, possibly to
@@ -2308,7 +2308,7 @@
 
 failureException = RuntimeError
 
- self.failUnless(Foo('test').failureException is RuntimeError)
+ self.assertTrue(Foo('test').failureException is RuntimeError)
 
 
 Foo('test').run(result)
@@ -2331,7 +2331,7 @@
 
 failureException = RuntimeError
 
- self.failUnless(Foo('test').failureException is RuntimeError)
+ self.assertTrue(Foo('test').failureException is RuntimeError)
 
 
 Foo('test').run(result)
@@ -2367,7 +2367,7 @@
 def runTest(self):
 pass
 
- self.failUnless(isinstance(Foo().id(), str))
+ self.assertTrue(isinstance(Foo().id(), str))
 
 # "If result is omitted or None, a temporary result object is created
 # and used, but is not made available to the caller. As TestCase owns the
@@ -2900,23 +2900,23 @@
 
 class Test_Assertions(TestCase):
 def test_AlmostEqual(self):
- self.failUnlessAlmostEqual(1.00000001, 1.0)
- self.failIfAlmostEqual(1.0000001, 1.0)
+ self.assertAlmostEqual(1.00000001, 1.0)
+ self.assertNotAlmostEqual(1.0000001, 1.0)
 self.assertRaises(self.failureException,
- self.failUnlessAlmostEqual, 1.0000001, 1.0)
+ self.assertAlmostEqual, 1.0000001, 1.0)
 self.assertRaises(self.failureException,
- self.failIfAlmostEqual, 1.00000001, 1.0)
+ self.assertNotAlmostEqual, 1.00000001, 1.0)
 
- self.failUnlessAlmostEqual(1.1, 1.0, places=0)
+ self.assertAlmostEqual(1.1, 1.0, places=0)
 self.assertRaises(self.failureException,
- self.failUnlessAlmostEqual, 1.1, 1.0, places=1)
+ self.assertAlmostEqual, 1.1, 1.0, places=1)
 
- self.failUnlessAlmostEqual(0, .1+.1j, places=0)
- self.failIfAlmostEqual(0, .1+.1j, places=1)
+ self.assertAlmostEqual(0, .1+.1j, places=0)
+ self.assertNotAlmostEqual(0, .1+.1j, places=1)
 self.assertRaises(self.failureException,
- self.failUnlessAlmostEqual, 0, .1+.1j, places=1)
+ self.assertAlmostEqual, 0, .1+.1j, places=1)
 self.assertRaises(self.failureException,
- self.failIfAlmostEqual, 0, .1+.1j, places=0)
+ self.assertNotAlmostEqual, 0, .1+.1j, places=0)
 
 def test_assertRaises(self):
 def _raise(e):

---

• Previous message: [Python-checkins] r74384 - in python/branches/release31-maint: Lib/ctypes/test/test_anon.py Lib/ctypes/test/test_array_in_pointer.py Lib/ctypes/test/test_arrays.py Lib/ctypes/test/test_as_parameter.py Lib/ctypes/test/test_bitfields.py Lib/ctypes/test/test_buffers.py Lib/ctypes/test/test_byteswap.py Lib/ctypes/test/test_callbacks.py Lib/ctypes/test/test_cast.py Lib/ctypes/test/test_cfuncs.py Lib/ctypes/test/test_checkretval.py Lib/ctypes/test/test_errno.py Lib/ctypes/test/test_find.py Lib/ctypes/test/test_frombuffer.py Lib/ctypes/test/test_funcptr.py Lib/ctypes/test/test_functions.py Lib/ctypes/test/test_incomplete.py Lib/ctypes/test/test_init.py Lib/ctypes/test/test_internals.py Lib/ctypes/test/test_keeprefs.py Lib/ctypes/test/test_libc.py Lib/ctypes/test/test_loading.py Lib/ctypes/test/test_macholib.py Lib/ctypes/test/test_memfunctions.py Lib/ctypes/test/test_numbers.py Lib/ctypes/test/test_parameters.py Lib/ctypes/test/test_pep3118.py Lib/ctypes/test/test_pickling.py Lib/ctypes/test/test_pointers.py Lib/ctypes/test/test_prototypes.py Lib/ctypes/test/test_python_api.py Lib/ctypes/test/test_random_things.py Lib/ctypes/test/test_refcounts.py Lib/ctypes/test/test_repr.py Lib/ctypes/test/test_returnfuncptrs.py Lib/ctypes/test/test_simplesubclasses.py Lib/ctypes/test/test_sizes.py Lib/ctypes/test/test_slicing.py Lib/ctypes/test/test_stringptr.py Lib/ctypes/test/test_strings.py Lib/ctypes/test/test_struct_fields.py Lib/ctypes/test/test_structures.py Lib/ctypes/test/test_unaligned_structures.py Lib/ctypes/test/test_unicode.py Lib/ctypes/test/test_values.py Lib/ctypes/test/test_varsize_struct.py Lib/ctypes/test/test_win32.py Lib/distutils/tests/test_archive_util.py Lib/distutils/tests/test_bdist_rpm.py Lib/distutils/tests/test_bdist_wininst.py Lib/distutils/tests/test_build_clib.py Lib/distutils/tests/test_build_ext.py Lib/distutils/tests/test_build_py.py Lib/distutils/tests/test_build_scripts.py Lib/distutils/tests/test_clean.py Lib/distutils/tests/test_cmd.py Lib/distutils/tests/test_config.py Lib/distutils/tests/test_config_cmd.py Lib/distutils/tests/test_dist.py Lib/distutils/tests/test_install.py Lib/distutils/tests/test_install_data.py Lib/distutils/tests/test_install_lib.py Lib/distutils/tests/test_install_scripts.py Lib/distutils/tests/test_msvc9compiler.py Lib/distutils/tests/test_register.py Lib/distutils/tests/test_sysconfig.py Lib/distutils/tests/test_upload.py Lib/distutils/tests/test_util.py Lib/email/test/test_email.py Lib/importlib/test/builtin/test_finder.py Lib/importlib/test/builtin/test_loader.py Lib/importlib/test/extension/test_finder.py Lib/importlib/test/extension/test_loader.py Lib/importlib/test/extension/test_path_hook.py Lib/importlib/test/frozen/test_finder.py Lib/importlib/test/frozen/test_loader.py Lib/importlib/test/import_/test_caching.py Lib/importlib/test/import_/test_fromlist.py Lib/importlib/test/import_/test_meta_path.py Lib/importlib/test/import_/test_packages.py Lib/importlib/test/import_/test_path.py Lib/importlib/test/import_/test_relative_imports.py Lib/importlib/test/source/test_abc_loader.py Lib/importlib/test/source/test_file_loader.py Lib/importlib/test/source/test_finder.py Lib/importlib/test/source/test_path_hook.py Lib/importlib/test/test_util.py Lib/json/tests/test_decode.py Lib/json/tests/test_speedups.py Lib/test/mapping_tests.py Lib/test/pickletester.py Lib/test/test___all__.py Lib/test/test___future__.py Lib/test/test_abc.py Lib/test/test_abstract_numbers.py Lib/test/test_array.py Lib/test/test_ast.py Lib/test/test_augassign.py Lib/test/test_base64.py Lib/test/test_bigmem.py Lib/test/test_binascii.py Lib/test/test_binop.py Lib/test/test_bisect.py Lib/test/test_bool.py Lib/test/test_bufio.py Lib/test/test_builtin.py Lib/test/test_bytes.py Lib/test/test_capi.py Lib/test/test_cfgparser.py Lib/test/test_cgi.py Lib/test/test_cmath.py Lib/test/test_cmd_line.py Lib/test/test_cmd_line_script.py Lib/test/test_codecs.py Lib/test/test_codeop.py Lib/test/test_collections.py Lib/test/test_compile.py Lib/test/test_complex.py Lib/test/test_contains.py Lib/test/test_contextlib.py Lib/test/test_copy.py Lib/test/test_copyreg.py Lib/test/test_csv.py Lib/test/test_datetime.py Lib/test/test_dbm.py Lib/test/test_dbm_dumb.py Lib/test/test_dbm_gnu.py Lib/test/test_dbm_ndbm.py Lib/test/test_decimal.py Lib/test/test_defaultdict.py Lib/test/test_deque.py Lib/test/test_descr.py Lib/test/test_dict.py Lib/test/test_dictviews.py Lib/test/test_docxmlrpc.py Lib/test/test_dummy_thread.py Lib/test/test_epoll.py Lib/test/test_errno.py Lib/test/test_exceptions.py Lib/test/test_file.py Lib/test/test_filecmp.py Lib/test/test_fileinput.py Lib/test/test_fileio.py Lib/test/test_float.py Lib/test/test_fnmatch.py Lib/test/test_ftplib.py Lib/test/test_funcattrs.py Lib/test/test_functools.py Lib/test/test_genericpath.py Lib/test/test_getargs2.py Lib/test/test_getopt.py Lib/test/test_gettext.py Lib/test/test_grammar.py Lib/test/test_grp.py Lib/test/test_gzip.py Lib/test/test_hash.py Lib/test/test_hashlib.py Lib/test/test_heapq.py Lib/test/test_hmac.py Lib/test/test_http_cookiejar.py Lib/test/test_httplib.py Lib/test/test_httpservers.py Lib/test/test_imp.py Lib/test/test_import.py Lib/test/test_importhooks.py Lib/test/test_index.py Lib/test/test_inspect.py Lib/test/test_int.py Lib/test/test_io.py Lib/test/test_ioctl.py Lib/test/test_iter.py Lib/test/test_itertools.py Lib/test/test_kqueue.py Lib/test/test_largefile.py Lib/test/test_list.py Lib/test/test_logging.py Lib/test/test_long.py Lib/test/test_macpath.py Lib/test/test_mailbox.py Lib/test/test_math.py Lib/test/test_memoryio.py Lib/test/test_memoryview.py Lib/test/test_mimetypes.py Lib/test/test_minidom.py Lib/test/test_mmap.py Lib/test/test_module.py Lib/test/test_modulefinder.py Lib/test/test_multibytecodec.py Lib/test/test_multibytecodec_support.py Lib/test/test_netrc.py Lib/test/test_normalization.py Lib/test/test_opcodes.py Lib/test/test_operator.py Lib/test/test_optparse.py Lib/test/test_os.py Lib/test/test_ossaudiodev.py Lib/test/test_parser.py Lib/test/test_peepholer.py Lib/test/test_pep247.py Lib/test/test_pep277.py Lib/test/test_pep3120.py Lib/test/test_pep352.py Lib/test/test_pkg.py Lib/test/test_pkgimport.py Lib/test/test_platform.py Lib/test/test_poplib.py Lib/test/test_posix.py Lib/test/test_posixpath.py Lib/test/test_pprint.py Lib/test/test_property.py Lib/test/test_pwd.py Lib/test/test_pyclbr.py Lib/test/test_pydoc.py Lib/test/test_queue.py Lib/test/test_raise.py Lib/test/test_random.py Lib/test/test_range.py Lib/test/test_re.py Lib/test/test_reprlib.py Lib/test/test_richcmp.py Lib/test/test_robotparser.py Lib/test/test_runpy.py Lib/test/test_scope.py Lib/test/test_set.py Lib/test/test_shutil.py Lib/test/test_signal.py Lib/test/test_site.py Lib/test/test_slice.py Lib/test/test_socket.py Lib/test/test_stringprep.py Lib/test/test_strptime.py Lib/test/test_struct.py Lib/test/test_structseq.py Lib/test/test_subprocess.py Lib/test/test_symtable.py Lib/test/test_sys.py Lib/test/test_tarfile.py Lib/test/test_tempfile.py Lib/test/test_threading.py Lib/test/test_threading_local.py Lib/test/test_time.py Lib/test/test_timeout.py Lib/test/test_tokenize.py Lib/test/test_traceback.py Lib/test/test_tuple.py Lib/test/test_types.py Lib/test/test_unary.py Lib/test/test_unicode.py Lib/test/test_unicode_file.py Lib/test/test_unicodedata.py Lib/test/test_urllib.py Lib/test/test_urllib2.py Lib/test/test_urllib2_localnet.py Lib/test/test_urllib2net.py Lib/test/test_urllibnet.py Lib/test/test_userdict.py Lib/test/test_uuid.py Lib/test/test_warnings.py Lib/test/test_weakref.py Lib/test/test_weakset.py Lib/test/test_winreg.py Lib/test/test_wsgiref.py Lib/test/test_xdrlib.py Lib/test/test_xmlrpc.py Lib/test/test_xmlrpc_net.py Lib/test/test_zipfile.py Lib/test/test_zipimport.py Lib/test/test_zipimport_support.py Lib/test/test_zlib.py Lib/tkinter/test/test_tkinter/test_text.py Lib/tkinter/test/test_ttk/test_extensions.py Lib/tkinter/test/test_ttk/test_functions.py Lib/tkinter/test/test_ttk/test_style.py Lib/tkinter/test/test_ttk/test_widgets.py
• Next message: [Python-checkins] r74386 - python/branches/release31-maint
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list