Skip to content

Commit dfaee0e

Browse files
author
georg.brandl
committed
Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........ git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74384 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent 9f9f4a4 commit dfaee0e

274 files changed

Lines changed: 4543 additions & 4543 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Lib/ctypes/test/test_anon.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ class Y(Structure):
1414
("y", c_int)]
1515
_anonymous_ = ["_"]
1616

17-
self.failUnlessEqual(Y.a.offset, sizeof(c_int))
18-
self.failUnlessEqual(Y.b.offset, sizeof(c_int))
17+
self.assertEqual(Y.a.offset, sizeof(c_int))
18+
self.assertEqual(Y.b.offset, sizeof(c_int))
1919

20-
self.failUnlessEqual(ANON.a.offset, 0)
21-
self.failUnlessEqual(ANON.b.offset, 0)
20+
self.assertEqual(ANON.a.offset, 0)
21+
self.assertEqual(ANON.b.offset, 0)
2222

2323
def test_anon_nonseq(self):
2424
# TypeError: _anonymous_ must be a sequence
25-
self.failUnlessRaises(TypeError,
25+
self.assertRaises(TypeError,
2626
lambda: type(Structure)("Name",
2727
(Structure,),
2828
{"_fields_": [], "_anonymous_": 42}))
2929

3030
def test_anon_nonmember(self):
3131
# AttributeError: type object 'Name' has no attribute 'x'
32-
self.failUnlessRaises(AttributeError,
32+
self.assertRaises(AttributeError,
3333
lambda: type(Structure)("Name",
3434
(Structure,),
3535
{"_fields_": [],
@@ -50,11 +50,11 @@ class Y(Structure):
5050
("y", c_int)]
5151
_anonymous_ = ["_"]
5252

53-
self.failUnlessEqual(Y.x.offset, 0)
54-
self.failUnlessEqual(Y.a.offset, sizeof(c_int))
55-
self.failUnlessEqual(Y.b.offset, sizeof(c_int))
56-
self.failUnlessEqual(Y._.offset, sizeof(c_int))
57-
self.failUnlessEqual(Y.y.offset, sizeof(c_int) * 2)
53+
self.assertEqual(Y.x.offset, 0)
54+
self.assertEqual(Y.a.offset, sizeof(c_int))
55+
self.assertEqual(Y.b.offset, sizeof(c_int))
56+
self.assertEqual(Y._.offset, sizeof(c_int))
57+
self.assertEqual(Y.y.offset, sizeof(c_int) * 2)
5858

5959
if __name__ == "__main__":
6060
unittest.main()

‎Lib/ctypes/test/test_array_in_pointer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test(self):
2626
c.pvalues = val_array
2727

2828
# memory contains 4 NUL bytes now, that's correct
29-
self.failUnlessEqual("00-00-00-00", dump(val_array))
29+
self.assertEqual("00-00-00-00", dump(val_array))
3030

3131
# set the values of the array through the pointer:
3232
for i in range(4):
@@ -35,7 +35,7 @@ def test(self):
3535
values = [c.pvalues[i].val for i in range(4)]
3636

3737
# These are the expected results: here s the bug!
38-
self.failUnlessEqual(
38+
self.assertEqual(
3939
(values, dump(val_array)),
4040
([1, 2, 3, 4], "01-02-03-04")
4141
)
@@ -45,7 +45,7 @@ def test_2(self):
4545
val_array = (Value * 4)()
4646

4747
# memory contains 4 NUL bytes now, that's correct
48-
self.failUnlessEqual("00-00-00-00", dump(val_array))
48+
self.assertEqual("00-00-00-00", dump(val_array))
4949

5050
ptr = cast(val_array, POINTER(Value))
5151
# set the values of the array through the pointer:
@@ -55,7 +55,7 @@ def test_2(self):
5555
values = [ptr[i].val for i in range(4)]
5656

5757
# These are the expected results: here s the bug!
58-
self.failUnlessEqual(
58+
self.assertEqual(
5959
(values, dump(val_array)),
6060
([1, 2, 3, 4], "01-02-03-04")
6161
)

‎Lib/ctypes/test/test_arrays.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ def test_simple(self):
1919

2020
ia = int_array(*init)
2121
# length of instance ok?
22-
self.failUnlessEqual(len(ia), alen)
22+
self.assertEqual(len(ia), alen)
2323

2424
# slot values ok?
2525
values = [ia[i] for i in range(len(init))]
26-
self.failUnlessEqual(values, init)
26+
self.assertEqual(values, init)
2727

2828
# change the items
2929
from operator import setitem
3030
new_values = list(range(42, 42+alen))
3131
[setitem(ia, n, new_values[n]) for n in range(alen)]
3232
values = [ia[i] for i in range(len(init))]
33-
self.failUnlessEqual(values, new_values)
33+
self.assertEqual(values, new_values)
3434

3535
# are the items initialized to 0?
3636
ia = int_array()
3737
values = [ia[i] for i in range(len(init))]
38-
self.failUnlessEqual(values, [0] * len(init))
38+
self.assertEqual(values, [0] * len(init))
3939

4040
# Too many in itializers should be caught
4141
self.assertRaises(IndexError, int_array, *range(alen*2))
@@ -48,14 +48,14 @@ def test_simple(self):
4848
# CharArray("abc")
4949
self.assertRaises(TypeError, CharArray, "abc")
5050

51-
self.failUnlessEqual(ca[0], b"a")
52-
self.failUnlessEqual(ca[1], b"b")
53-
self.failUnlessEqual(ca[2], b"c")
54-
self.failUnlessEqual(ca[-3], b"a")
55-
self.failUnlessEqual(ca[-2], b"b")
56-
self.failUnlessEqual(ca[-1], b"c")
51+
self.assertEqual(ca[0], b"a")
52+
self.assertEqual(ca[1], b"b")
53+
self.assertEqual(ca[2], b"c")
54+
self.assertEqual(ca[-3], b"a")
55+
self.assertEqual(ca[-2], b"b")
56+
self.assertEqual(ca[-1], b"c")
5757

58-
self.failUnlessEqual(len(ca), 3)
58+
self.assertEqual(len(ca), 3)
5959

6060
# cannot delete items
6161
from operator import delitem
@@ -69,34 +69,34 @@ def test_numeric_arrays(self):
6969

7070
na = numarray()
7171
values = [na[i] for i in range(alen)]
72-
self.failUnlessEqual(values, [0] * alen)
72+
self.assertEqual(values, [0] * alen)
7373

7474
na = numarray(*[c_int()] * alen)
7575
values = [na[i] for i in range(alen)]
76-
self.failUnlessEqual(values, [0]*alen)
76+
self.assertEqual(values, [0]*alen)
7777

7878
na = numarray(1, 2, 3, 4, 5)
7979
values = [i for i in na]
80-
self.failUnlessEqual(values, [1, 2, 3, 4, 5])
80+
self.assertEqual(values, [1, 2, 3, 4, 5])
8181

8282
na = numarray(*map(c_int, (1, 2, 3, 4, 5)))
8383
values = [i for i in na]
84-
self.failUnlessEqual(values, [1, 2, 3, 4, 5])
84+
self.assertEqual(values, [1, 2, 3, 4, 5])
8585

8686
def test_classcache(self):
87-
self.failUnless(not ARRAY(c_int, 3) is ARRAY(c_int, 4))
88-
self.failUnless(ARRAY(c_int, 3) is ARRAY(c_int, 3))
87+
self.assertTrue(not ARRAY(c_int, 3) is ARRAY(c_int, 4))
88+
self.assertTrue(ARRAY(c_int, 3) is ARRAY(c_int, 3))
8989

9090
def test_from_address(self):
9191
# Failed with 0.9.8, reported by JUrner
9292
p = create_string_buffer("foo")
9393
sz = (c_char * 3).from_address(addressof(p))
94-
self.failUnlessEqual(sz[:], b"foo")
95-
self.failUnlessEqual(sz[::], b"foo")
96-
self.failUnlessEqual(sz[::-1], b"oof")
97-
self.failUnlessEqual(sz[::3], b"f")
98-
self.failUnlessEqual(sz[1:4:2], b"o")
99-
self.failUnlessEqual(sz.value, b"foo")
94+
self.assertEqual(sz[:], b"foo")
95+
self.assertEqual(sz[::], b"foo")
96+
self.assertEqual(sz[::-1], b"oof")
97+
self.assertEqual(sz[::3], b"f")
98+
self.assertEqual(sz[1:4:2], b"o")
99+
self.assertEqual(sz.value, b"foo")
100100

101101
try:
102102
create_unicode_buffer
@@ -106,12 +106,12 @@ def test_from_address(self):
106106
def test_from_addressW(self):
107107
p = create_unicode_buffer("foo")
108108
sz = (c_wchar * 3).from_address(addressof(p))
109-
self.failUnlessEqual(sz[:], "foo")
110-
self.failUnlessEqual(sz[::], "foo")
111-
self.failUnlessEqual(sz[::-1], "oof")
112-
self.failUnlessEqual(sz[::3], "f")
113-
self.failUnlessEqual(sz[1:4:2], "o")
114-
self.failUnlessEqual(sz.value, "foo")
109+
self.assertEqual(sz[:], "foo")
110+
self.assertEqual(sz[::], "foo")
111+
self.assertEqual(sz[::-1], "oof")
112+
self.assertEqual(sz[::3], "f")
113+
self.assertEqual(sz[1:4:2], "o")
114+
self.assertEqual(sz.value, "foo")
115115

116116
def test_cache(self):
117117
# Array types are cached internally in the _ctypes extension,
@@ -125,7 +125,7 @@ class my_int(c_int):
125125
# Create a new array type based on it:
126126
t1 = my_int * 1
127127
t2 = my_int * 1
128-
self.failUnless(t1 is t2)
128+
self.assertTrue(t1 is t2)
129129

130130
if __name__ == '__main__':
131131
unittest.main()

‎Lib/ctypes/test/test_as_parameter.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def test_wchar_parm(self):
2525
f = dll._testfunc_i_bhilfd
2626
f.argtypes = [c_byte, c_wchar, c_int, c_long, c_float, c_double]
2727
result = f(self.wrap(1), self.wrap("x"), self.wrap(3), self.wrap(4), self.wrap(5.0), self.wrap(6.0))
28-
self.failUnlessEqual(result, 139)
29-
self.failUnless(type(result), int)
28+
self.assertEqual(result, 139)
29+
self.assertTrue(type(result), int)
3030

3131
def test_pointers(self):
3232
f = dll._testfunc_p_p
@@ -39,18 +39,18 @@ def test_pointers(self):
3939

4040
v = c_int(42)
4141

42-
self.failUnlessEqual(pointer(v).contents.value, 42)
42+
self.assertEqual(pointer(v).contents.value, 42)
4343
result = f(self.wrap(pointer(v)))
44-
self.failUnlessEqual(type(result), POINTER(c_int))
45-
self.failUnlessEqual(result.contents.value, 42)
44+
self.assertEqual(type(result), POINTER(c_int))
45+
self.assertEqual(result.contents.value, 42)
4646

4747
# This on works...
4848
result = f(self.wrap(pointer(v)))
49-
self.failUnlessEqual(result.contents.value, v.value)
49+
self.assertEqual(result.contents.value, v.value)
5050

5151
p = pointer(c_int(99))
5252
result = f(self.wrap(p))
53-
self.failUnlessEqual(result.contents.value, 99)
53+
self.assertEqual(result.contents.value, 99)
5454

5555
def test_shorts(self):
5656
f = dll._testfunc_callback_i_if
@@ -67,7 +67,7 @@ def callback(v):
6767

6868
cb = CallBack(callback)
6969
f(self.wrap(2**18), self.wrap(cb))
70-
self.failUnlessEqual(args, expected)
70+
self.assertEqual(args, expected)
7171

7272
################################################################
7373

@@ -84,17 +84,17 @@ def callback(value):
8484
cb = MyCallback(callback)
8585

8686
result = f(self.wrap(-10), self.wrap(cb))
87-
self.failUnlessEqual(result, -18)
87+
self.assertEqual(result, -18)
8888

8989
# test with prototype
9090
f.argtypes = [c_int, MyCallback]
9191
cb = MyCallback(callback)
9292

9393
result = f(self.wrap(-10), self.wrap(cb))
94-
self.failUnlessEqual(result, -18)
94+
self.assertEqual(result, -18)
9595

9696
result = f(self.wrap(-10), self.wrap(cb))
97-
self.failUnlessEqual(result, -18)
97+
self.assertEqual(result, -18)
9898

9999
AnotherCallback = CALLBACK_FUNCTYPE(c_int, c_int, c_int, c_int, c_int)
100100

@@ -116,12 +116,12 @@ def test_callbacks_2(self):
116116

117117
def callback(value):
118118
#print "called back with", value
119-
self.failUnlessEqual(type(value), int)
119+
self.assertEqual(type(value), int)
120120
return value
121121

122122
cb = MyCallback(callback)
123123
result = f(self.wrap(-10), self.wrap(cb))
124-
self.failUnlessEqual(result, -18)
124+
self.assertEqual(result, -18)
125125

126126
def test_longlong_callbacks(self):
127127

@@ -133,12 +133,12 @@ def test_longlong_callbacks(self):
133133
f.argtypes = [c_longlong, MyCallback]
134134

135135
def callback(value):
136-
self.failUnless(isinstance(value, int))
136+
self.assertTrue(isinstance(value, int))
137137
return value & 0x7FFFFFFF
138138

139139
cb = MyCallback(callback)
140140

141-
self.failUnlessEqual(13577625587, int(f(self.wrap(1000000000000), self.wrap(cb))))
141+
self.assertEqual(13577625587, int(f(self.wrap(1000000000000), self.wrap(cb))))
142142

143143
def test_byval(self):
144144
# without prototype
@@ -148,7 +148,7 @@ def test_byval(self):
148148
result = dll._testfunc_byval(ptin, byref(ptout))
149149
got = result, ptout.x, ptout.y
150150
expected = 3, 1, 2
151-
self.failUnlessEqual(got, expected)
151+
self.assertEqual(got, expected)
152152

153153
# with prototype
154154
ptin = POINT(101, 102)
@@ -158,7 +158,7 @@ def test_byval(self):
158158
result = dll._testfunc_byval(self.wrap(ptin), byref(ptout))
159159
got = result, ptout.x, ptout.y
160160
expected = 203, 101, 102
161-
self.failUnlessEqual(got, expected)
161+
self.assertEqual(got, expected)
162162

163163
def test_struct_return_2H(self):
164164
class S2H(Structure):
@@ -168,7 +168,7 @@ class S2H(Structure):
168168
dll.ret_2h_func.argtypes = [S2H]
169169
inp = S2H(99, 88)
170170
s2h = dll.ret_2h_func(self.wrap(inp))
171-
self.failUnlessEqual((s2h.x, s2h.y), (99*2, 88*3))
171+
self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
172172

173173
def test_struct_return_8H(self):
174174
class S8I(Structure):
@@ -184,7 +184,7 @@ class S8I(Structure):
184184
dll.ret_8i_func.argtypes = [S8I]
185185
inp = S8I(9, 8, 7, 6, 5, 4, 3, 2)
186186
s8i = dll.ret_8i_func(self.wrap(inp))
187-
self.failUnlessEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h),
187+
self.assertEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h),
188188
(9*2, 8*3, 7*4, 6*5, 5*6, 4*7, 3*8, 2*9))
189189

190190
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)