From 47a8c005d9d4b2a8d60f955840783f784a1d53ed Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Mon, 7 Sep 2020 15:56:21 -0300 Subject: [PATCH] change zmq port for tests so it doesnt conflict with running lbrycrd --- lbry/blockchain/lbrycrd.py | 2 +- tests/integration/blockchain/test_blockchain.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lbry/blockchain/lbrycrd.py b/lbry/blockchain/lbrycrd.py index 441f8f506..11aa79ba2 100644 --- a/lbry/blockchain/lbrycrd.py +++ b/lbry/blockchain/lbrycrd.py @@ -90,7 +90,7 @@ class Lbrycrd: Config.with_same_dir(tempfile.mkdtemp()).set( lbrycrd_rpc_port=9245 + 2, # avoid conflict with default rpc port lbrycrd_peer_port=9246 + 2, # avoid conflict with default peer port - lbrycrd_zmq_blocks="tcp://127.0.0.1:29000" + lbrycrd_zmq_blocks="tcp://127.0.0.1:29002" # avoid conflict with default port ) )) diff --git a/tests/integration/blockchain/test_blockchain.py b/tests/integration/blockchain/test_blockchain.py index e8f0de508..7804dfc34 100644 --- a/tests/integration/blockchain/test_blockchain.py +++ b/tests/integration/blockchain/test_blockchain.py @@ -309,19 +309,19 @@ class TestLbrycrdAPIs(AsyncioTestCase): await chain.stop() # lbrycrdr started with zmq, ensure_subscribable updates lbrycrd_zmq_blocks config - await chain.start('-zmqpubhashblock=tcp://127.0.0.1:29000') + await chain.start('-zmqpubhashblock=tcp://127.0.0.1:29005') self.assertEqual(chain.ledger.conf.lbrycrd_zmq_blocks, '') await chain.ensure_subscribable() - self.assertEqual(chain.ledger.conf.lbrycrd_zmq_blocks, 'tcp://127.0.0.1:29000') + self.assertEqual(chain.ledger.conf.lbrycrd_zmq_blocks, 'tcp://127.0.0.1:29005') await chain.stop() # lbrycrdr started with zmq, ensure_subscribable does not override lbrycrd_zmq_blocks config chain.ledger.conf.set(lbrycrd_zmq_blocks='') - await chain.start('-zmqpubhashblock=tcp://127.0.0.1:29000') + await chain.start('-zmqpubhashblock=tcp://127.0.0.1:29005') self.assertEqual(chain.ledger.conf.lbrycrd_zmq_blocks, '') - chain.ledger.conf.set(lbrycrd_zmq_blocks='tcp://external-ip:29000') + chain.ledger.conf.set(lbrycrd_zmq_blocks='tcp://external-ip:29005') await chain.ensure_subscribable() - self.assertEqual(chain.ledger.conf.lbrycrd_zmq_blocks, 'tcp://external-ip:29000') + self.assertEqual(chain.ledger.conf.lbrycrd_zmq_blocks, 'tcp://external-ip:29005') async def test_block_event(self): chain = Lbrycrd.temp_regtest()