diff --git a/tests/requirements.txt b/tests/requirements.txt index 1ed26906f..4208596b7 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,14 +1,12 @@ -flake8==3.6.0 -pytest==4.1.1 -CherryPy==18.1.0 -Flask==1.0.2 -cheroot==6.5.4 -ephemeral-port-reserve==1.1.0 -flaky==3.5.3 -mako==1.0.14 +flake8==3.7.8 +pytest==5.0.1 +Flask==1.1.1 +cheroot==6.5.5 +ephemeral-port-reserve==1.1.1 +flaky==3.6.0 pytest-benchmark==3.2.2 -pytest-forked==1.0.1 -pytest-xdist==1.26.0 +pytest-forked==1.0.2 +pytest-xdist==1.29.0 python-bitcoinlib==0.10.1 -tqdm==4.29.1 +tqdm==4.32.2 pytest-timeout==1.3.3 diff --git a/tests/test_misc.py b/tests/test_misc.py index 027d1ae32..e53c67a58 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -893,8 +893,8 @@ def test_funding_reorg_remote_lags(node_factory, bitcoind): # Make l2 temporary blind for blocks > 107 def no_more_blocks(req): - return {"result": None, - "error": {"code": -8, "message": "Block height out of range"}, "id": req['id']} + return {"result": None, + "error": {"code": -8, "message": "Block height out of range"}, "id": req['id']} l2.daemon.rpcproxy.mock_rpc('getblockhash', no_more_blocks) diff --git a/tests/utils.py b/tests/utils.py index 8acff465a..ad40f0d42 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -91,7 +91,7 @@ def get_tx_p2wsh_outnum(bitcoind, tx, amount): for out in decoded['vout']: if out['scriptPubKey']['type'] == 'witness_v0_scripthash': if out['value'] == Decimal(amount) / 10**8: - return out['n'] + return out['n'] return None @@ -465,7 +465,7 @@ class LightningNode(object): self.allow_bad_gossip = allow_bad_gossip def connect(self, remote_node): - self.rpc.connect(remote_node.info['id'], '127.0.0.1', remote_node.daemon.port) + self.rpc.connect(remote_node.info['id'], '127.0.0.1', remote_node.daemon.port) def is_connected(self, remote_node): return remote_node.info['id'] in [p['id'] for p in self.rpc.listpeers()['peers']]