summaryrefslogtreecommitdiffstats
path: root/Lib/ctypes/test
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-13 08:52:53 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-13 08:52:53 (GMT)
commitfe5f11c684ff44f45dcc38a671efc17b30fca055 (patch)
treeaec16686f7bff27621f163e486862d29f8f7a619 /Lib/ctypes/test
parentab91fdef1f1e556203a2eee98ba7d379e4790de9 (diff)
downloadcpython-fe5f11c684ff44f45dcc38a671efc17b30fca055.zip
cpython-fe5f11c684ff44f45dcc38a671efc17b30fca055.tar.gz
cpython-fe5f11c684ff44f45dcc38a671efc17b30fca055.tar.bz2
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 (Tue, 30 Jun 2009) | 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 (Tue, 30 Jun 2009) | 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 ................
Diffstat (limited to 'Lib/ctypes/test')
-rw-r--r--Lib/ctypes/test/test_internals.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ctypes/test/test_internals.py b/Lib/ctypes/test/test_internals.py
index f7d9a1b..03d820e 100644
--- a/Lib/ctypes/test/test_internals.py
+++ b/Lib/ctypes/test/test_internals.py
@@ -18,7 +18,7 @@ What about pointers?
"""
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 @@ class ObjectsTestCase(unittest.TestCase):
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):