Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[2.7] bpo-30850: Use specialized assert methods in bsddb tests. #2584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jul 5, 2017
Merged

[2.7] bpo-30850: Use specialized assert methods in bsddb tests. #2584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions 7 Lib/bsddb/test/test_associate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def finish_test(self, secDB, txn=None):
self.assertEqual(vals, None, vals)

vals = secDB.pget('Unknown', txn=txn)
self.assertTrue(vals[0] == 99 or vals[0] == '99', vals)
self.assertIn(vals[0], (99, '99'), vals)
vals[1].index('Unknown')
vals[1].index('Unnamed')
vals[1].index('unknown')
Expand All @@ -247,7 +247,8 @@ def finish_test(self, secDB, txn=None):
if type(self.keytype) == type(''):
self.assertTrue(int(rec[0])) # for primary db, key is a number
else:
self.assertTrue(rec[0] and type(rec[0]) == type(0))
self.assertTrue(rec[0])
self.assertIs(type(rec[0]), int)
count = count + 1
if verbose:
print rec
Expand All @@ -262,7 +263,7 @@ def finish_test(self, secDB, txn=None):

# test cursor pget
vals = self.cur.pget('Unknown', flags=db.DB_LAST)
self.assertTrue(vals[1] == 99 or vals[1] == '99', vals)
self.assertIn(vals[1], (99, '99'), vals)
self.assertEqual(vals[0], 'Unknown')
vals[2].index('Unknown')
vals[2].index('Unnamed')
Expand Down
16 changes: 8 additions & 8 deletions 16 Lib/bsddb/test/test_basics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ def test06_Truncate(self):

d.put("abcde", "ABCDE");
num = d.truncate()
self.assertTrue(num >= 1, "truncate returned <= 0 on non-empty database")
self.assertGreaterEqual(num, 1, "truncate returned <= 0 on non-empty database")
num = d.truncate()
self.assertEqual(num, 0,
"truncate on empty DB returned nonzero (%r)" % (num,))
Expand All @@ -616,9 +616,9 @@ def test07_verify(self):
if db.version() >= (4, 6):
def test08_exists(self) :
self.d.put("abcde", "ABCDE")
self.assertTrue(self.d.exists("abcde") == True,
self.assertEqual(self.d.exists("abcde"), True,
"DB->exists() returns wrong value")
self.assertTrue(self.d.exists("x") == False,
self.assertEqual(self.d.exists("x"), False,
"DB->exists() returns wrong value")

#----------------------------------------
Expand Down Expand Up @@ -773,7 +773,7 @@ def test06_Transactions(self):
if verbose:
print 'log file: ' + log
logs = self.env.log_archive(db.DB_ARCH_REMOVE)
self.assertTrue(not logs)
self.assertFalse(logs)

self.txn = self.env.txn_begin()

Expand All @@ -785,9 +785,9 @@ def test08_exists(self) :
self.d.put("abcde", "ABCDE", txn=txn)
txn.commit()
txn = self.env.txn_begin()
self.assertTrue(self.d.exists("abcde", txn=txn) == True,
self.assertEqual(self.d.exists("abcde", txn=txn), True,
"DB->exists() returns wrong value")
self.assertTrue(self.d.exists("x", txn=txn) == False,
self.assertEqual(self.d.exists("x", txn=txn), False,
"DB->exists() returns wrong value")
txn.abort()

Expand All @@ -802,7 +802,7 @@ def test09_TxnTruncate(self):
d.put("abcde", "ABCDE");
txn = self.env.txn_begin()
num = d.truncate(txn)
self.assertTrue(num >= 1, "truncate returned <= 0 on non-empty database")
self.assertGreaterEqual(num, 1, "truncate returned <= 0 on non-empty database")
num = d.truncate(txn)
self.assertEqual(num, 0,
"truncate on empty DB returned nonzero (%r)" % (num,))
Expand Down Expand Up @@ -1086,7 +1086,7 @@ def test02_assignment(self) :
a = "example of private object"
self.obj.set_private(a)
b = self.obj.get_private()
self.assertTrue(a is b) # Object identity
self.assertIs(a, b) # Object identity

def test03_leak_assignment(self) :
a = "example of private object"
Expand Down
88 changes: 44 additions & 44 deletions 88 Lib/bsddb/test/test_dbenv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ def test_cache_max(self) :
self.env.set_cache_max(0, size)
size2 = self.env.get_cache_max()
self.assertEqual(0, size2[0])
self.assertTrue(size <= size2[1])
self.assertTrue(2*size > size2[1])
self.assertLessEqual(size, size2[1])
self.assertGreater(2*size, size2[1])

if db.version() >= (4, 4) :
def test_mutex_stat(self) :
self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL |
db.DB_INIT_LOCK)
stat = self.env.mutex_stat()
self.assertTrue("mutex_inuse_max" in stat)
self.assertIn("mutex_inuse_max", stat)

def test_lg_filemode(self) :
for i in [0600, 0660, 0666] :
Expand Down Expand Up @@ -128,8 +128,8 @@ def test_lg_regionmax(self) :
i = i*1024*1024
self.env.set_lg_regionmax(i)
j = self.env.get_lg_regionmax()
self.assertTrue(i <= j)
self.assertTrue(2*i > j)
self.assertLessEqual(i, j)
self.assertGreater(2*i, j)

def test_lk_detect(self) :
flags= [db.DB_LOCK_DEFAULT, db.DB_LOCK_EXPIRE, db.DB_LOCK_MAXLOCKS,
Expand All @@ -150,10 +150,10 @@ def test_lg_dir(self) :
def test_lg_bsize(self) :
log_size = 70*1024
self.env.set_lg_bsize(log_size)
self.assertTrue(self.env.get_lg_bsize() >= log_size)
self.assertTrue(self.env.get_lg_bsize() < 4*log_size)
self.assertGreaterEqual(self.env.get_lg_bsize(), log_size)
self.assertLess(self.env.get_lg_bsize(), 4*log_size)
self.env.set_lg_bsize(4*log_size)
self.assertTrue(self.env.get_lg_bsize() >= 4*log_size)
self.assertGreaterEqual(self.env.get_lg_bsize(), 4*log_size)

def test_setget_data_dirs(self) :
dirs = ("a", "b", "c", "d")
Expand Down Expand Up @@ -185,7 +185,7 @@ def test_setget_cachesize(self) :
self.assertEqual(cachesize2[0], cachesize3[0])
self.assertEqual(cachesize2[2], cachesize3[2])
# In Berkeley DB 5.1, the cachesize can change when opening the Env
self.assertTrue(cachesize2[1] <= cachesize3[1])
self.assertLessEqual(cachesize2[1], cachesize3[1])

def test_set_cachesize_dbenv_db(self) :
# You can not configure the cachesize using
Expand Down Expand Up @@ -299,7 +299,7 @@ def test_log_printf(self) :
msg = "This is a test..."
self.env.log_printf(msg)
logc = self.env.log_cursor()
self.assertTrue(msg in (logc.last()[1]))
self.assertIn(msg, logc.last()[1])

if db.version() >= (4, 7) :
def test_log_config(self) :
Expand Down Expand Up @@ -341,21 +341,21 @@ def test_log_printf(self) :
txn.commit()
logc = self.env.log_cursor()
logc.last() # Skip the commit
self.assertTrue(msg in (logc.prev()[1]))
self.assertIn(msg, logc.prev()[1])

msg = "This is another test..."
txn = self.env.txn_begin()
self.env.log_printf(msg, txn=txn)
txn.abort() # Do not store the new message
logc.last() # Skip the abort
self.assertTrue(msg not in (logc.prev()[1]))
self.assertNotIn(msg, logc.prev()[1])

msg = "This is a third test..."
txn = self.env.txn_begin()
self.env.log_printf(msg, txn=txn)
txn.commit() # Do not store the new message
logc.last() # Skip the commit
self.assertTrue(msg in (logc.prev()[1]))
self.assertIn(msg, logc.prev()[1])


class DBEnv_memp(DBEnv):
Expand All @@ -372,39 +372,39 @@ def tearDown(self):

def test_memp_1_trickle(self) :
self.db.put("hi", "bye")
self.assertTrue(self.env.memp_trickle(100) > 0)
self.assertGreater(self.env.memp_trickle(100), 0)

# Preserve the order, do "memp_trickle" test first
def test_memp_2_sync(self) :
self.db.put("hi", "bye")
self.env.memp_sync() # Full flush
# Nothing to do...
self.assertTrue(self.env.memp_trickle(100) == 0)
self.assertEqual(self.env.memp_trickle(100), 0)

self.db.put("hi", "bye2")
self.env.memp_sync((1, 0)) # NOP, probably
# Something to do... or not
self.assertTrue(self.env.memp_trickle(100) >= 0)
self.assertGreaterEqual(self.env.memp_trickle(100), 0)

self.db.put("hi", "bye3")
self.env.memp_sync((123, 99)) # Full flush
# Nothing to do...
self.assertTrue(self.env.memp_trickle(100) == 0)
self.assertEqual(self.env.memp_trickle(100), 0)

def test_memp_stat_1(self) :
stats = self.env.memp_stat() # No param
self.assertTrue(len(stats)==2)
self.assertTrue("cache_miss" in stats[0])
self.assertEqual(len(stats), 2)
self.assertIn("cache_miss", stats[0])
stats = self.env.memp_stat(db.DB_STAT_CLEAR) # Positional param
self.assertTrue("cache_miss" in stats[0])
self.assertIn("cache_miss", stats[0])
stats = self.env.memp_stat(flags=0) # Keyword param
self.assertTrue("cache_miss" in stats[0])
self.assertIn("cache_miss", stats[0])

def test_memp_stat_2(self) :
stats=self.env.memp_stat()[1]
self.assertTrue(len(stats))==1
self.assertTrue("test" in stats)
self.assertTrue("page_in" in stats["test"])
self.assertEqual(len(stats), 1)
self.assertIn("test", stats)
self.assertIn("page_in", stats["test"])

class DBEnv_logcursor(DBEnv):
def setUp(self):
Expand All @@ -426,28 +426,28 @@ def tearDown(self):
DBEnv.tearDown(self)

def _check_return(self, value) :
self.assertTrue(isinstance(value, tuple))
self.assertIsInstance(value, tuple)
self.assertEqual(len(value), 2)
self.assertTrue(isinstance(value[0], tuple))
self.assertIsInstance(value[0], tuple)
self.assertEqual(len(value[0]), 2)
self.assertTrue(isinstance(value[0][0], int))
self.assertTrue(isinstance(value[0][1], int))
self.assertTrue(isinstance(value[1], str))
self.assertIsInstance(value[0][0], int)
self.assertIsInstance(value[0][1], int)
self.assertIsInstance(value[1], str)

# Preserve test order
def test_1_first(self) :
logc = self.env.log_cursor()
v = logc.first()
self._check_return(v)
self.assertTrue((1, 1) < v[0])
self.assertTrue(len(v[1])>0)
self.assertLess((1, 1), v[0])
self.assertGreater(len(v[1]), 0)

def test_2_last(self) :
logc = self.env.log_cursor()
lsn_first = logc.first()[0]
v = logc.last()
self._check_return(v)
self.assertTrue(lsn_first < v[0])
self.assertLess(lsn_first, v[0])

def test_3_next(self) :
logc = self.env.log_cursor()
Expand All @@ -456,16 +456,16 @@ def test_3_next(self) :
lsn_first = logc.first()[0]
v = logc.next()
self._check_return(v)
self.assertTrue(lsn_first < v[0])
self.assertTrue(lsn_last > v[0])
self.assertLess(lsn_first, v[0])
self.assertGreater(lsn_last, v[0])

v2 = logc.next()
self.assertTrue(v2[0] > v[0])
self.assertTrue(lsn_last > v2[0])
self.assertGreater(v2[0], v[0])
self.assertGreater(lsn_last, v2[0])

v3 = logc.next()
self.assertTrue(v3[0] > v2[0])
self.assertTrue(lsn_last > v3[0])
self.assertGreater(v3[0], v2[0])
self.assertGreater(lsn_last, v3[0])

def test_4_prev(self) :
logc = self.env.log_cursor()
Expand All @@ -474,16 +474,16 @@ def test_4_prev(self) :
lsn_last = logc.last()[0]
v = logc.prev()
self._check_return(v)
self.assertTrue(lsn_first < v[0])
self.assertTrue(lsn_last > v[0])
self.assertLess(lsn_first, v[0])
self.assertGreater(lsn_last, v[0])

v2 = logc.prev()
self.assertTrue(v2[0] < v[0])
self.assertTrue(lsn_first < v2[0])
self.assertLess(v2[0], v[0])
self.assertLess(lsn_first, v2[0])

v3 = logc.prev()
self.assertTrue(v3[0] < v2[0])
self.assertTrue(lsn_first < v3[0])
self.assertLess(v3[0], v2[0])
self.assertLess(lsn_first, v3[0])

def test_5_current(self) :
logc = self.env.log_cursor()
Expand Down
2 changes: 1 addition & 1 deletion 2 Lib/bsddb/test/test_dbshelve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def checkrec(self, key, value):
self.assertEqual(value.L, [x] * 10)

else:
self.assertTrue(0, 'Unknown key type, fix the test')
self.fail('Unknown key type, fix the test')

#----------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions 4 Lib/bsddb/test/test_dbtables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ def test01(self):
colval = pickle.loads(values[0][colname])
else :
colval = pickle.loads(bytes(values[0][colname], "iso8859-1"))
self.assertTrue(colval > 3.141)
self.assertTrue(colval < 3.142)
self.assertGreater(colval, 3.141)
self.assertLess(colval, 3.142)


def test02(self):
Expand Down
4 changes: 2 additions & 2 deletions 4 Lib/bsddb/test/test_distributed_transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def test01_distributed_transactions(self) :
recovered_txns=self.dbenv.txn_recover()
self.assertEqual(self.num_txns,len(recovered_txns))
for gid,txn in recovered_txns :
self.assertTrue(gid in txns)
self.assertIn(gid, txns)
del txn
del recovered_txns

Expand Down Expand Up @@ -122,7 +122,7 @@ def test01_distributed_transactions(self) :
# Be sure there are not pending transactions.
# Check also database size.
recovered_txns=self.dbenv.txn_recover()
self.assertTrue(len(recovered_txns)==0)
self.assertEqual(len(recovered_txns), 0)
self.assertEqual(len(committed_txns),self.db.stat()["nkeys"])

class DBTxn_distributedSYNC(DBTxn_distributed):
Expand Down
4 changes: 2 additions & 2 deletions 4 Lib/bsddb/test/test_lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ def deadlock_detection() :
end_time=time.time()
deadlock_detection.end=True
# Floating point rounding
self.assertTrue((end_time-start_time) >= 0.0999)
self.assertGreaterEqual(end_time-start_time, 0.0999)
self.env.lock_put(lock)
t.join()

self.env.lock_id_free(anID)
self.env.lock_id_free(anID2)

if db.version() >= (4,6):
self.assertTrue(deadlock_detection.count>0)
self.assertGreater(deadlock_detection.count, 0)

def theThread(self, lockType):
import sys
Expand Down
2 changes: 1 addition & 1 deletion 2 Lib/bsddb/test/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def test01_badpointer(self):
def test02_db_home(self):
env = db.DBEnv()
# check for crash fixed when db_home is used before open()
self.assertTrue(env.db_home is None)
self.assertIsNone(env.db_home)
env.open(self.homeDir, db.DB_CREATE)
if sys.version_info[0] < 3 :
self.assertEqual(self.homeDir, env.db_home)
Expand Down
2 changes: 1 addition & 1 deletion 2 Lib/bsddb/test/test_recno.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
def assertIsInstance(self, obj, datatype, msg=None) :
return self.assertEqual(type(obj), datatype, msg=msg)
def assertGreaterEqual(self, a, b, msg=None) :
return self.assertTrue(a>=b, msg=msg)
return self.assertGreaterEqual(a, b, msg=msg)


def setUp(self):
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.