From ffa5c20c8872d2df5dbbdbc4b1c43a7ca157a8df Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Sun, 12 Jan 2020 00:48:46 -0300 Subject: [PATCH] fix hanging test --- lbry/wallet/orchstr8/node.py | 3 +++ tests/integration/blockchain/test_network.py | 14 ++++++++------ .../blockchain/test_wallet_server_sessions.py | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lbry/wallet/orchstr8/node.py b/lbry/wallet/orchstr8/node.py index 44a190814..a94a7bc0a 100644 --- a/lbry/wallet/orchstr8/node.py +++ b/lbry/wallet/orchstr8/node.py @@ -173,6 +173,9 @@ class SPVNode: async def start(self, blockchain_node: 'BlockchainNode', extraconf=None): self.data_path = tempfile.mkdtemp() conf = { + 'DESCRIPTION': '', + 'PAYMENT_ADDRESS': '', + 'DAILY_FEE': '0', 'DB_DIRECTORY': self.data_path, 'DAEMON_URL': blockchain_node.rpc_url, 'REORG_LIMIT': '100', diff --git a/tests/integration/blockchain/test_network.py b/tests/integration/blockchain/test_network.py index 113c9a474..fb119bf5e 100644 --- a/tests/integration/blockchain/test_network.py +++ b/tests/integration/blockchain/test_network.py @@ -1,5 +1,4 @@ import logging -import os import asyncio import lbry @@ -33,11 +32,14 @@ class NetworkTests(IntegrationTestCase): 'server_version': lbry.__version__}, await self.ledger.network.get_server_features()) await self.conductor.spv_node.stop() address = (await self.account.get_addresses(limit=1))[0] - os.environ.update({ - 'DESCRIPTION': 'Fastest server in the west.', - 'PAYMENT_ADDRESS': address, - 'DAILY_FEE': '42'}) - await self.conductor.spv_node.start(self.conductor.blockchain_node) + await self.conductor.spv_node.start( + self.conductor.blockchain_node, + extraconf={ + 'DESCRIPTION': 'Fastest server in the west.', + 'PAYMENT_ADDRESS': address, + 'DAILY_FEE': '42' + } + ) await self.ledger.network.on_connected.first self.assertDictEqual({ 'genesis_hash': self.conductor.spv_node.coin_class.GENESIS_HASH, diff --git a/tests/integration/blockchain/test_wallet_server_sessions.py b/tests/integration/blockchain/test_wallet_server_sessions.py index 9c1a3a513..18c7b9504 100644 --- a/tests/integration/blockchain/test_wallet_server_sessions.py +++ b/tests/integration/blockchain/test_wallet_server_sessions.py @@ -69,6 +69,7 @@ class TestUsagePayment(CommandTestCase): node = SPVNode(self.conductor.spv_module, node_number=2) await node.start(self.blockchain, extraconf={"PAYMENT_ADDRESS": address, "DAILY_FEE": "1.1"}) + self.addCleanup(node.stop) self.daemon.jsonrpc_settings_set('lbryum_servers', [f"{node.hostname}:{node.port}"]) await self.daemon.jsonrpc_wallet_reconnect()