wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8871 from LukasMoll/flake8-bindings-python-tests 

bindings/python/tests Applied flake8
This commit is contained in:
A.J. Beamon 2022-11-21 09:22:41 -08:00 committed by GitHub
parent 750669c9d8 f57c977d73
commit 4a6b29deff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindings/python/tests/cancellation_timeout_tests.py
View File

@ -518,7 +518,7 @@ def test_timeouts(db):
for i in range(2): for i in range(2):
tr.options.set_timeout(1500) tr.options.set_timeout(1500)
tr.set_read_version(0x7ffffffffffffff0) tr.set_read_version(0x7ffffffffffffff0)
x = tr[b'foo'] _ = tr[b'foo']
try: try:
tr.commit().wait() tr.commit().wait()
tr.reset() tr.reset()
@ -557,7 +557,7 @@ def test_db_timeouts(db):
tr[b'foo'] = b'bar' tr[b'foo'] = b'bar'
tr.on_error(err).wait() # should not throw tr.on_error(err).wait() # should not throw
time.sleep(1) time.sleep(1)
tr[b'foo'] _ = tr[b'foo']
try: try:
tr.commit().wait() # should throw tr.commit().wait() # should throw
raise TestError("(2) Timeout didn't fire.") raise TestError("(2) Timeout didn't fire.")
@ -574,7 +574,7 @@ def test_db_timeouts(db):
time.sleep(0.75) time.sleep(0.75)
tr[b'foo'] = b'bar' tr[b'foo'] = b'bar'
tr.on_error(err).wait() # should not throw tr.on_error(err).wait() # should not throw
tr[b'foo'] _ = tr[b'foo']
time.sleep(0.75) time.sleep(0.75)
try: try:
tr.commit().wait() # should throw tr.commit().wait() # should throw
@ -615,7 +615,7 @@ def test_db_timeouts(db):
tr.reset() tr.reset()
tr[b'foo'] = b'bar' tr[b'foo'] = b'bar'
time.sleep(0.2) time.sleep(0.2)
tr.on_error(err).wait() #should not throw tr.on_error(err).wait() # should not throw
tr[b'foo'] = b'bar' tr[b'foo'] = b'bar'
time.sleep(0.8) time.sleep(0.8)
try: try:

5
bindings/python/tests/size_limit_tests.py
View File

@ -24,15 +24,18 @@ import sys
if __name__ == '__main__': if __name__ == '__main__':
fdb.api_version(720) fdb.api_version(720)
@fdb.transactional @fdb.transactional
def setValue(tr, key, value): def setValue(tr, key, value):
tr[key] = value tr[key] = value
@fdb.transactional @fdb.transactional
def setValueWithLimit(tr, key, value, limit): def setValueWithLimit(tr, key, value, limit):
tr.options.set_size_limit(limit) tr.options.set_size_limit(limit)
tr[key] = value tr[key] = value
def test_size_limit_option(db): def test_size_limit_option(db):
value = b'a' * 1024 value = b'a' * 1024
@ -69,6 +72,7 @@ def test_size_limit_option(db):
# Reset the size limit for future tests # Reset the size limit for future tests
db.options.set_transaction_size_limit(10000000) db.options.set_transaction_size_limit(10000000)
@fdb.transactional @fdb.transactional
def test_get_approximate_size(tr): def test_get_approximate_size(tr):
tr[b'key1'] = b'value1' tr[b'key1'] = b'value1'
@ -90,6 +94,7 @@ def test_get_approximate_size(tr):
s5 = tr.get_approximate_size().wait() s5 = tr.get_approximate_size().wait()
assert(s4 < s5) assert(s4 < s5)
# Expect a cluster file as input. This test will write to the FDB cluster, so # Expect a cluster file as input. This test will write to the FDB cluster, so
# be aware of potential side effects. # be aware of potential side effects.
if __name__ == '__main__': if __name__ == '__main__':

19
bindings/python/tests/tenant_tests.py
View File

@ -27,24 +27,26 @@ from fdb.tuple import pack
if __name__ == '__main__': if __name__ == '__main__':
fdb.api_version(720) fdb.api_version(720)
def cleanup_tenant(db, tenant_name): def cleanup_tenant(db, tenant_name):
try: try:
tenant = db.open_tenant(tenant_name) tenant = db.open_tenant(tenant_name)
del tenant[:] del tenant[:]
fdb.tenant_management.delete_tenant(db, tenant_name) fdb.tenant_management.delete_tenant(db, tenant_name)
except fdb.FDBError as e: except fdb.FDBError as e:
if e.code == 2131: # tenant not found if e.code == 2131: # tenant not found
pass pass
else: else:
raise raise
def test_tenant_tuple_name(db): def test_tenant_tuple_name(db):
tuplename=(b'test', b'level', b'hierarchy', 3, 1.24, 'str') tuplename = (b'test', b'level', b'hierarchy', 3, 1.24, 'str')
cleanup_tenant(db, tuplename) cleanup_tenant(db, tuplename)
fdb.tenant_management.create_tenant(db, tuplename) fdb.tenant_management.create_tenant(db, tuplename)
tenant=db.open_tenant(tuplename) tenant = db.open_tenant(tuplename)
tenant[b'foo'] = b'bar' tenant[b'foo'] = b'bar'
assert tenant[b'foo'] == b'bar' assert tenant[b'foo'] == b'bar'
@ -100,7 +102,7 @@ def test_tenant_operations(db):
del tr1[:] del tr1[:]
tr1.commit().wait() tr1.commit().wait()
except fdb.FDBError as e: except fdb.FDBError as e:
tr.on_error(e).wait() tr1.on_error(e).wait()
assert tenant1[b'tenant_test_key'] == None assert tenant1[b'tenant_test_key'] == None
assert db[prefix1 + b'tenant_test_key'] == None assert db[prefix1 + b'tenant_test_key'] == None
@ -113,7 +115,7 @@ def test_tenant_operations(db):
tenant1[b'tenant_test_key'] tenant1[b'tenant_test_key']
assert False assert False
except fdb.FDBError as e: except fdb.FDBError as e:
assert e.code == 2131 # tenant not found assert e.code == 2131 # tenant not found
del tenant2[:] del tenant2[:]
fdb.tenant_management.delete_tenant(db, b'tenant2') fdb.tenant_management.delete_tenant(db, b'tenant2')
@ -126,6 +128,7 @@ def test_tenant_operations(db):
assert db[b'tenant_test_key'] == None assert db[b'tenant_test_key'] == None
def test_tenant_operation_retries(db): def test_tenant_operation_retries(db):
cleanup_tenant(db, b'tenant1') cleanup_tenant(db, b'tenant1')
cleanup_tenant(db, b'tenant2') cleanup_tenant(db, b'tenant2')
@ -138,7 +141,7 @@ def test_tenant_operation_retries(db):
fdb.tenant_management.create_tenant(db, b'tenant1') fdb.tenant_management.create_tenant(db, b'tenant1')
assert False assert False
except fdb.FDBError as e: except fdb.FDBError as e:
assert e.code == 2132 # tenant already exists assert e.code == 2132 # tenant already exists
# Using a transaction skips the existence check # Using a transaction skips the existence check
tr = db.create_transaction() tr = db.create_transaction()
@ -166,7 +169,7 @@ def test_tenant_operation_retries(db):
fdb.tenant_management.delete_tenant(db, b'tenant1') fdb.tenant_management.delete_tenant(db, b'tenant1')
assert False assert False
except fdb.FDBError as e: except fdb.FDBError as e:
assert e.code == 2131 # tenant not found assert e.code == 2131 # tenant not found
# Using a transaction skips the existence check # Using a transaction skips the existence check
tr = db.create_transaction() tr = db.create_transaction()
@ -186,11 +189,13 @@ def test_tenant_operation_retries(db):
except fdb.FDBError as e: except fdb.FDBError as e:
tr.on_error(e).wait() tr.on_error(e).wait()
def test_tenants(db): def test_tenants(db):
test_tenant_tuple_name(db) test_tenant_tuple_name(db)
test_tenant_operations(db) test_tenant_operations(db)
test_tenant_operation_retries(db) test_tenant_operation_retries(db)
# Expect a cluster file as input. This test will write to the FDB cluster, so # Expect a cluster file as input. This test will write to the FDB cluster, so
# be aware of potential side effects. # be aware of potential side effects.
if __name__ == '__main__': if __name__ == '__main__':

18
bindings/python/tests/tester.py
View File

@ -26,7 +26,6 @@ import sys
import os import os
import struct import struct
import threading import threading
import time
import random import random
import time import time
import traceback import traceback
@ -136,7 +135,7 @@ def test_fdb_transactional_generator(db):
def function_that_yields(tr): def function_that_yields(tr):
yield 0 yield 0
assert fdb.get_api_version() < 630, "Pre-6.3, a decorator may wrap a function that yields" assert fdb.get_api_version() < 630, "Pre-6.3, a decorator may wrap a function that yields"
except ValueError as e: except ValueError:
assert fdb.get_api_version() >= 630, "Post-6.3, a decorator should throw if wrapped function yields" assert fdb.get_api_version() >= 630, "Post-6.3, a decorator should throw if wrapped function yields"
@ -144,12 +143,13 @@ def test_fdb_transactional_returns_generator(db):
try: try:
def function_that_yields(tr): def function_that_yields(tr):
yield 0 yield 0
@fdb.transactional @fdb.transactional
def function_that_returns(tr): def function_that_returns(tr):
return function_that_yields(tr) return function_that_yields(tr)
function_that_returns() function_that_returns()
assert fdb.get_api_version() < 630, "Pre-6.3, returning a generator is allowed" assert fdb.get_api_version() < 630, "Pre-6.3, returning a generator is allowed"
except ValueError as e: except ValueError:
assert fdb.get_api_version() >= 630, "Post-6.3, returning a generator should throw" assert fdb.get_api_version() >= 630, "Post-6.3, returning a generator should throw"
@ -400,11 +400,11 @@ class Tester:
inst.push(f) inst.push(f)
elif inst.op == six.u("GET_ESTIMATED_RANGE_SIZE"): elif inst.op == six.u("GET_ESTIMATED_RANGE_SIZE"):
begin, end = inst.pop(2) begin, end = inst.pop(2)
estimatedSize = obj.get_estimated_range_size_bytes(begin, end).wait() obj.get_estimated_range_size_bytes(begin, end).wait()
inst.push(b"GOT_ESTIMATED_RANGE_SIZE") inst.push(b"GOT_ESTIMATED_RANGE_SIZE")
elif inst.op == six.u("GET_RANGE_SPLIT_POINTS"): elif inst.op == six.u("GET_RANGE_SPLIT_POINTS"):
begin, end, chunkSize = inst.pop(3) begin, end, chunkSize = inst.pop(3)
estimatedSize = obj.get_range_split_points(begin, end, chunkSize).wait() obj.get_range_split_points(begin, end, chunkSize).wait()
inst.push(b"GOT_RANGE_SPLIT_POINTS") inst.push(b"GOT_RANGE_SPLIT_POINTS")
elif inst.op == six.u("GET_KEY"): elif inst.op == six.u("GET_KEY"):
key, or_equal, offset, prefix = inst.pop(4) key, or_equal, offset, prefix = inst.pop(4)
@ -522,7 +522,7 @@ class Tester:
self.last_version = inst.tr.get_committed_version() self.last_version = inst.tr.get_committed_version()
inst.push(b"GOT_COMMITTED_VERSION") inst.push(b"GOT_COMMITTED_VERSION")
elif inst.op == six.u("GET_APPROXIMATE_SIZE"): elif inst.op == six.u("GET_APPROXIMATE_SIZE"):
approximate_size = inst.tr.get_approximate_size().wait() inst.tr.get_approximate_size().wait()
inst.push(b"GOT_APPROXIMATE_SIZE") inst.push(b"GOT_APPROXIMATE_SIZE")
elif inst.op == six.u("GET_VERSIONSTAMP"): elif inst.op == six.u("GET_VERSIONSTAMP"):
inst.push(inst.tr.get_versionstamp()) inst.push(inst.tr.get_versionstamp())
@ -613,9 +613,9 @@ class Tester:
result += [tenant.key] result += [tenant.key]
try: try:
metadata = json.loads(tenant.value) metadata = json.loads(tenant.value)
id = metadata["id"] _ = metadata["id"]
prefix = metadata["prefix"] _ = metadata["prefix"]
except (json.decoder.JSONDecodeError, KeyError) as e: except (json.decoder.JSONDecodeError, KeyError):
assert False, "Invalid Tenant Metadata" assert False, "Invalid Tenant Metadata"
inst.push(fdb.tuple.pack(tuple(result))) inst.push(fdb.tuple.pack(tuple(result)))
elif inst.op == six.u("UNIT_TESTS"): elif inst.op == six.u("UNIT_TESTS"):

2
bindings/python/tests/tuple_tests.py
View File

@ -173,7 +173,7 @@ def tupleTest(N=10000):
print("Prefix not before prefixed:\n Tuple: %s\n Bytes: %s\n Other: %s\n Bytes: %s" % (t, repr(pack(t)), t2, repr(pack(t2)))) print("Prefix not before prefixed:\n Tuple: %s\n Bytes: %s\n Other: %s\n Bytes: %s" % (t, repr(pack(t)), t2, repr(pack(t2))))
return False return False
print ("Tuple check %d OK" % N) print("Tuple check %d OK" % N)
return True return True
# test: # test: