Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1948 from bigchaindb/fix-test-and-rm-pytest-catchlog-on-tendermint-branch

Browse Source 
Fixed failing test and removed pytest-catchlog on tendermint branch
This commit is contained in:
Troy McConaghy 2017-12-07 14:26:48 +01:00 committed by GitHub
commit 3f369eb83c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -52,7 +52,6 @@ tests_require = [
'hypothesis-regex', 'hypothesis-regex',
'pylint', 'pylint',
'pytest>=3.0.0', 'pytest>=3.0.0',
'pytest-catchlog>=1.2.2',
'pytest-cov>=2.2.1', 'pytest-cov>=2.2.1',
'pytest-mock', 'pytest-mock',
'pytest-xdist', 'pytest-xdist',

3
tests/backend/localmongodb/test_queries.py
View File

@ -89,13 +89,14 @@ def test_get_owned_ids(signed_create_tx, user_pk):
assert txns[0] == signed_create_tx.to_dict() assert txns[0] == signed_create_tx.to_dict()
def test_get_spending_transactions(user_pk): def test_get_spending_transactions(user_pk, user_sk):
from bigchaindb.backend import connect, query from bigchaindb.backend import connect, query
from bigchaindb.models import Transaction from bigchaindb.models import Transaction
conn = connect() conn = connect()
out = [([user_pk], 1)] out = [([user_pk], 1)]
tx1 = Transaction.create([user_pk], out * 3) tx1 = Transaction.create([user_pk], out * 3)
tx1.sign([user_sk])
inputs = tx1.to_inputs() inputs = tx1.to_inputs()
tx2 = Transaction.transfer([inputs[0]], out, tx1.id) tx2 = Transaction.transfer([inputs[0]], out, tx1.id)
tx3 = Transaction.transfer([inputs[1]], out, tx1.id) tx3 = Transaction.transfer([inputs[1]], out, tx1.id)