Skip to content

Commit 61c5a9a

Browse files
author
James William Pye
committed
Use assert* per deprecation warnings in python3.2.
1 parent 81ecad0 commit 61c5a9a

19 files changed

Lines changed: 983 additions & 973 deletions

‎postgresql/test/test_alock.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class test_alock(unittest.TestCase):
1414
def testALockWait(self):
1515
# sadly, this is primarily used to exercise the code paths..
1616
ad = prepare(n_alocks).first
17-
self.failUnlessEqual(ad(), 0)
17+
self.assertEqual(ad(), 0)
1818
state = [False, False, False]
1919
alt = new()
2020
first = alock.ExclusiveLock(db, (0,0))
@@ -37,31 +37,31 @@ def concurrent_lock():
3737
t.start()
3838
while not state[0]:
3939
time.sleep(0.01)
40-
self.failUnlessEqual(ad(), 2)
40+
self.assertEqual(ad(), 2)
4141
state[1] = True
4242
with first:
43-
self.failUnlessEqual(ad(), 2)
43+
self.assertEqual(ad(), 2)
4444
state[2] = True
4545
with second:
46-
self.failUnlessEqual(ad(), 2)
46+
self.assertEqual(ad(), 2)
4747
t.join(timeout = 1)
4848

4949
@pg_tmp
5050
def testALockNoWait(self):
5151
alt = new()
5252
ad = prepare(n_alocks).first
53-
self.failUnlessEqual(ad(), 0)
53+
self.assertEqual(ad(), 0)
5454
with alock.ExclusiveLock(db, (0,0)):
5555
l=alock.ExclusiveLock(alt, (0,0))
5656
# should fail to acquire
57-
self.failUnlessEqual(l.acquire(blocking=False), False)
57+
self.assertEqual(l.acquire(blocking=False), False)
5858
# no alocks should exist now
59-
self.failUnlessEqual(ad(), 0)
59+
self.assertEqual(ad(), 0)
6060

6161
@pg_tmp
6262
def testALock(self):
6363
ad = prepare(n_alocks).first
64-
self.failUnlessEqual(ad(), 0)
64+
self.assertEqual(ad(), 0)
6565
# test a variety..
6666
lockids = [
6767
(1,4),
@@ -77,62 +77,62 @@ def testALock(self):
7777
sal1 = alock.ShareLock(db, *lockids)
7878
with sal1:
7979
with xal1, xal2:
80-
self.failUnless(ad() > 0)
80+
self.assertTrue(ad() > 0)
8181
for x in lockids:
8282
xl = alock.ExclusiveLock(alt, x)
83-
self.failUnlessEqual(xl.acquire(blocking=False), False)
83+
self.assertEqual(xl.acquire(blocking=False), False)
8484
# main has exclusives on these, so this should fail.
8585
xl = alock.ShareLock(alt, *lockids)
86-
self.failUnlessEqual(xl.acquire(blocking=False), False)
86+
self.assertEqual(xl.acquire(blocking=False), False)
8787
for x in lockids:
8888
# sal1 still holds
8989
xl = alock.ExclusiveLock(alt, x)
90-
self.failUnlessEqual(xl.acquire(blocking=False), False)
90+
self.assertEqual(xl.acquire(blocking=False), False)
9191
# sal1 still holds, but we want a share lock too.
9292
xl = alock.ShareLock(alt, x)
93-
self.failUnlessEqual(xl.acquire(blocking=False), True)
93+
self.assertEqual(xl.acquire(blocking=False), True)
9494
xl.release()
9595
# no alocks should exist now
96-
self.failUnlessEqual(ad(), 0)
96+
self.assertEqual(ad(), 0)
9797

9898
@pg_tmp
9999
def testPartialALock(self):
100100
# Validates that release is properly cleaning up
101101
ad = prepare(n_alocks).first
102-
self.failUnlessEqual(ad(), 0)
102+
self.assertEqual(ad(), 0)
103103
held = (0,-1234)
104104
wanted = [0, 324, -1232948, 7, held, 1, (2,4), (834,1)]
105105
alt = new()
106106
with alock.ExclusiveLock(db, held):
107107
l=alock.ExclusiveLock(alt, *wanted)
108108
# should fail to acquire, db has held
109-
self.failUnlessEqual(l.acquire(blocking=False), False)
109+
self.assertEqual(l.acquire(blocking=False), False)
110110
# No alocks should exist now.
111111
# This *MUST* occur prior to alt being closed.
112112
# Otherwise, we won't be testing for the recovery
113113
# of a failed non-blocking acquire().
114-
self.failUnlessEqual(ad(), 0)
114+
self.assertEqual(ad(), 0)
115115

116116
@pg_tmp
117117
def testALockParameterErrors(self):
118-
self.failUnlessRaises(TypeError, alock.ALock)
118+
self.assertRaises(TypeError, alock.ALock)
119119
l = alock.ExclusiveLock(db)
120-
self.failUnlessRaises(RuntimeError, l.release)
120+
self.assertRaises(RuntimeError, l.release)
121121

122122
@pg_tmp
123123
def testALockOnClosed(self):
124124
ad = prepare(n_alocks).first
125-
self.failUnlessEqual(ad(), 0)
125+
self.assertEqual(ad(), 0)
126126
held = (0,-1234)
127127
alt = new()
128128
# __exit__ should only touch the count.
129129
with alock.ExclusiveLock(alt, held) as l:
130-
self.failUnlessEqual(ad(), 1)
131-
self.failUnlessEqual(l.locked(), True)
130+
self.assertEqual(ad(), 1)
131+
self.assertEqual(l.locked(), True)
132132
alt.close()
133133
time.sleep(0.005)
134-
self.failUnlessEqual(ad(), 0)
135-
self.failUnlessEqual(l.locked(), False)
134+
self.assertEqual(ad(), 0)
135+
self.assertEqual(l.locked(), False)
136136

137137
if __name__ == '__main__':
138138
unittest.main()

‎postgresql/test/test_bytea_codec.py‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ def testDecoding(self):
2323
)
2424

2525
def testEncoding(self):
26-
self.failUnlessEqual('bytea'.encode('bytea'), b'bytea')
27-
self.failUnlessEqual('\\\\'.encode('bytea'), b'\\')
28-
self.failUnlessRaises(ValueError, '\\'.encode, 'bytea')
29-
self.failUnlessRaises(ValueError, 'foo\\'.encode, 'bytea')
30-
self.failUnlessRaises(ValueError, r'foo\0'.encode, 'bytea')
31-
self.failUnlessRaises(ValueError, r'foo\00'.encode, 'bytea')
32-
self.failUnlessRaises(ValueError, r'\f'.encode, 'bytea')
33-
self.failUnlessRaises(ValueError, r'\800'.encode, 'bytea')
34-
self.failUnlessRaises(ValueError, r'\7f0'.encode, 'bytea')
26+
self.assertEqual('bytea'.encode('bytea'), b'bytea')
27+
self.assertEqual('\\\\'.encode('bytea'), b'\\')
28+
self.assertRaises(ValueError, '\\'.encode, 'bytea')
29+
self.assertRaises(ValueError, 'foo\\'.encode, 'bytea')
30+
self.assertRaises(ValueError, r'foo\0'.encode, 'bytea')
31+
self.assertRaises(ValueError, r'foo\00'.encode, 'bytea')
32+
self.assertRaises(ValueError, r'\f'.encode, 'bytea')
33+
self.assertRaises(ValueError, r'\800'.encode, 'bytea')
34+
self.assertRaises(ValueError, r'\7f0'.encode, 'bytea')
3535
for x in range(255):
3636
seq = ('\\' + oct(x)[2:].lstrip('0').rjust(3, '0'))
3737
dx = ord(seq.encode('bytea'))
@@ -42,7 +42,4 @@ def testEncoding(self):
4242
)
4343

4444
if __name__ == '__main__':
45-
from types import ModuleType
46-
this = ModuleType("this")
47-
this.__dict__.update(globals())
48-
unittest.main(this)
45+
unittest.main()

‎postgresql/test/test_cluster.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def testSuperPassword(self):
6565
database='template1',
6666
)
6767
with c:
68-
self.failUnless(c.prepare('select 1').first() == 1)
68+
self.assertEqual(c.prepare('select 1').first(), 1)
6969

7070
def testNoParameters(self):
7171
'simple init and drop'

‎postgresql/test/test_configfile.py‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ def testParser(self):
186186
def testConfigRead(self):
187187
sample = "foo = bar"+os.linesep+"# A comment, yes."+os.linesep+" bar = foo # yet?"+os.linesep
188188
d = configfile.read_config(sample.split(os.linesep))
189-
self.failUnless(d['foo'] == 'bar')
190-
self.failUnless(d['bar'] == 'foo')
189+
self.assertTrue(d['foo'] == 'bar')
190+
self.assertTrue(d['bar'] == 'foo')
191191

192192
def testConfigWriteRead(self):
193193
strio = StringIO()
@@ -202,7 +202,7 @@ def testWinningCases(self):
202202
for before, alters, after in winning_cases:
203203
befg = (x + os.linesep for x in before.split(os.linesep))
204204
became = ''.join(configfile.alter_config(alters, befg))
205-
self.failUnless(
205+
self.assertTrue(
206206
became.strip() == after,
207207
'On %d, before, %r, did not become after, %r; got %r using %r' %(
208208
i, before, after, became, alters
@@ -217,9 +217,9 @@ def testSimpleConfigAlter(self):
217217
strio.seek(0)
218218
lines = configfile.alter_config({'foo' : 'yes', 'bleh' : 'feh'}, strio)
219219
d = configfile.read_config(lines)
220-
self.failUnless(d['foo'] == 'yes')
221-
self.failUnless(d['bleh'] == 'feh')
222-
self.failUnless(''.join(lines).count('bleh') == 1)
220+
self.assertTrue(d['foo'] == 'yes')
221+
self.assertTrue(d['bleh'] == 'feh')
222+
self.assertTrue(''.join(lines).count('bleh') == 1)
223223

224224
def testAroma(self):
225225
lines = configfile.alter_config({
@@ -228,31 +228,28 @@ def testAroma(self):
228228
}, (x + os.linesep for x in sample_config_Aroma.split('\n'))
229229
)
230230
d = configfile.read_config(lines)
231-
self.failUnless(d['shared_buffers'] == '800')
232-
self.failUnless(d.get('port') is None)
231+
self.assertTrue(d['shared_buffers'] == '800')
232+
self.assertTrue(d.get('port') is None)
233233

234234
nlines = configfile.alter_config({'port' : '1'}, lines)
235235
d2 = configfile.read_config(nlines)
236-
self.failUnless(d2.get('port') == '1')
237-
self.failUnless(
236+
self.assertTrue(d2.get('port') == '1')
237+
self.assertTrue(
238238
nlines[:4] == lines[:4]
239239
)
240240

241241
def testSelection(self):
242242
# Sanity
243243
red = configfile.read_config(['foo = bar'+os.linesep, 'bar = foo'])
244-
self.failUnless(len(red.keys()) == 2)
244+
self.assertTrue(len(red.keys()) == 2)
245245

246246
# Test a simple selector
247247
red = configfile.read_config(['foo = bar'+os.linesep, 'bar = foo'],
248248
selector = lambda x: x == 'bar')
249249
rkeys = list(red.keys())
250-
self.failUnless(len(rkeys) == 1)
251-
self.failUnless(rkeys[0] == 'bar')
252-
self.failUnless(red['bar'] == 'foo')
250+
self.assertTrue(len(rkeys) == 1)
251+
self.assertTrue(rkeys[0] == 'bar')
252+
self.assertTrue(red['bar'] == 'foo')
253253

254254
if __name__ == '__main__':
255-
from types import ModuleType
256-
this = ModuleType("this")
257-
this.__dict__.update(globals())
258-
unittest.main(this)
255+
unittest.main()

0 commit comments

Comments
 (0)