Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration

This commit is contained in:
diminator 2016-04-13 10:37:21 +02:00
commit d92ad44abc

View File

@ -29,7 +29,6 @@ def mock_bigchaindb_sign(monkeypatch):
monkeypatch.setattr('bigchaindb.util.sign_tx', mockreturn) monkeypatch.setattr('bigchaindb.util.sign_tx', mockreturn)
def test_temp_client_returns_a_temp_client(): def test_temp_client_returns_a_temp_client():
from bigchaindb.client import temp_client from bigchaindb.client import temp_client
client = temp_client() client = temp_client()
@ -37,6 +36,7 @@ def test_temp_client_returns_a_temp_client():
assert client.private_key assert client.private_key
@pytest.mark.usefixtures('restore_config')
def test_client_can_create_assets(mock_requests_post, client): def test_client_can_create_assets(mock_requests_post, client):
from bigchaindb import util from bigchaindb import util