Skip to content

Commit

Permalink
upgrade cython, remove benchmark in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
whtsky committed Feb 11, 2018
1 parent dc41a2a commit 171bd4a
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 36 deletions.
3 changes: 1 addition & 2 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pytest==3.0.5
pytest-benchmark==3.0.0
coverage==4.3.1
cython==0.25.2
cython==0.27.3
tox==2.5.0
24 changes: 12 additions & 12 deletions tests/test_decode.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,37 @@ def test_decode2():
assert length == 8


def test_decode_str(benchmark):
assert benchmark(bdecode, b'6:WWWWWW') == b"WWWWWW"
def test_decode_str():
assert bdecode(b'6:WWWWWW') == b"WWWWWW"


def test_decode_int(benchmark):
assert benchmark(bdecode, b'i233e') == 233
def test_decode_int():
assert bdecode(b'i233e') == 233


def test_decode_large_int(benchmark):
def test_decode_large_int():
assert bdecode(b'i1455189890e') == 1455189890
assert bdecode(b'i25735241490e') == 25735241490

MAX_SIZE = sys.maxsize + 1
BENCODED_MAXSIZE = ('i%de' % MAX_SIZE).encode()
assert benchmark(bdecode, BENCODED_MAXSIZE) == MAX_SIZE
assert bdecode(BENCODED_MAXSIZE) == MAX_SIZE


def test_decode_list(benchmark):
assert benchmark(bdecode, b'l1:a1:bi3ee') == [b'a', b'b', 3]
def test_decode_list():
assert bdecode(b'l1:a1:bi3ee') == [b'a', b'b', 3]


def test_decode_dict(benchmark):
def test_decode_dict():
od = dict()
od[b'ka'] = b'va'
od[b'kb'] = 2
assert benchmark(bdecode, b'd2:ka2:va2:kbi2ee') == od
assert bdecode(b'd2:ka2:va2:kbi2ee') == od


def test_ordered_dict(benchmark):
def test_ordered_dict():
from bencoder import OrderedDict
rv = benchmark(bdecode, b'd2:ka2:va2:kbi2ee')
rv = bdecode(b'd2:ka2:va2:kbi2ee')
assert isinstance(rv, OrderedDict)
assert list(rv.keys()) == [b'ka', b'kb']
assert list(bdecode(b'd2:kc2:va2:kei2ee').keys()) == [b'kc', b'ke']
Expand Down
44 changes: 22 additions & 22 deletions tests/test_encode.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,68 +10,68 @@
)


def test_encode_str(benchmark):
assert benchmark(bencode, "WWWWWW") == b'6:WWWWWW'
def test_encode_str():
assert bencode("WWWWWW") == b'6:WWWWWW'


def test_encode_int(benchmark):
assert benchmark(bencode, 233) == b'i233e'
def test_encode_int():
assert bencode(233) == b'i233e'


def test_encode_large_int(benchmark):
def test_encode_large_int():
assert bencode(1455189890) == b'i1455189890e'
assert bencode(25735241490) == b'i25735241490e'
MAX_SIZE = sys.maxsize + 1
BENCODED_MAXSIZE = ('i%de' % MAX_SIZE).encode()

assert benchmark(bencode, MAX_SIZE) == BENCODED_MAXSIZE
assert bencode(MAX_SIZE) == BENCODED_MAXSIZE


def test_encode_bytes(benchmark):
def test_encode_bytes():
b = b"TheseAreSomeBytes"
coded = benchmark(bencode, b)
coded = bencode(b)
l = str(len(b)).encode()
assert coded == l + b':' + b


def test_encode_string(benchmark):
def test_encode_string():
b = "TheseAreSomeString"
coded = benchmark(bencode, b)
coded = bencode(b)
l = str(len(b))
assert coded == (l + ':' + b).encode()


def test_encode_list(benchmark):
assert benchmark(bencode, ['a', 'b', 3]) == b'l1:a1:bi3ee'
def test_encode_list():
assert bencode(['a', 'b', 3]) == b'l1:a1:bi3ee'


def test_encode_tuple(benchmark):
assert benchmark(bencode, ('a', 'b', 3)) == b'l1:a1:bi3ee'
def test_encode_tuple():
assert bencode(('a', 'b', 3)) == b'l1:a1:bi3ee'


def test_encode_true(benchmark):
assert benchmark(bencode, True) == bencode(1)
def test_encode_true():
assert bencode(True) == bencode(1)


def test_encode_false(benchmark):
assert benchmark(bencode, False) == bencode(0)
def test_encode_false():
assert bencode(False) == bencode(0)


def test_encode_dict(benchmark):
def test_encode_dict():
od = dict()
od['ka'] = 'va'
od['kb'] = 2
assert benchmark(bencode, od) == b'd2:ka2:va2:kbi2ee'
assert bencode(od) == b'd2:ka2:va2:kbi2ee'


def test_encode_dict_subclass(benchmark):
def test_encode_dict_subclass():
class AAA(dict):
pass

od = AAA()
od['ka'] = 'va'
od['kb'] = 2
assert benchmark(bencode, od) == b'd2:ka2:va2:kbi2ee'
assert bencode(od) == b'd2:ka2:va2:kbi2ee'


def test_encode_complex():
Expand Down

0 comments on commit 171bd4a

Please sign in to comment.