mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Merge #10555: [tests] various improvements to zmq_test.py
0a4912e
[tests] timeout integration tests on travis after 20 minutes (John Newbery)7c51e9f
[tests] destroy zmq context in zmq_tests.py (John Newbery)b1bac1c
[tests] in zmq test, timeout if message not received (John Newbery)5ebd5f9
[tests] tidy up zmq_test.py (John Newbery)4a0c08f
[tests] update zmq test to use correct config.ini file (John Newbery) Tree-SHA512: 5e607af2f2dc5c73fba4b2d3890097580a7525f6a4996c7c78f01822e45e0054fd0a225ea53fce6308804e560cced6de6cf5d16137469dcf100b2e9643e08d03
This commit is contained in:
parent
e1a146d955
commit
aa364bf7af
@ -20,6 +20,7 @@ import datetime
|
||||
import os
|
||||
import time
|
||||
import shutil
|
||||
import signal
|
||||
import sys
|
||||
import subprocess
|
||||
import tempfile
|
||||
@ -85,7 +86,7 @@ BASE_SCRIPTS= [
|
||||
'rawtransactions.py',
|
||||
'reindex.py',
|
||||
# vv Tests less than 30s vv
|
||||
"zmq_test.py",
|
||||
'zmq_test.py',
|
||||
'mempool_resurrect_test.py',
|
||||
'txn_doublespend.py --mineblock',
|
||||
'txn_clone.py',
|
||||
@ -404,6 +405,10 @@ class TestHandler:
|
||||
time.sleep(.5)
|
||||
for j in self.jobs:
|
||||
(name, time0, proc, log_out, log_err) = j
|
||||
if os.getenv('TRAVIS') == 'true' and int(time.time() - time0) > 20 * 60:
|
||||
# In travis, timeout individual tests after 20 minutes (to stop tests hanging and not
|
||||
# providing useful output.
|
||||
proc.send_signal(signal.SIGINT)
|
||||
if proc.poll() is not None:
|
||||
log_out.seek(0), log_err.seek(0)
|
||||
[stdout, stderr] = [l.read().decode('utf-8') for l in (log_out, log_err)]
|
||||
|
@ -8,15 +8,15 @@ import os
|
||||
import struct
|
||||
|
||||
from test_framework.test_framework import BitcoinTestFramework, SkipTest
|
||||
from test_framework.util import *
|
||||
from test_framework.util import (assert_equal,
|
||||
bytes_to_hex_str,
|
||||
)
|
||||
|
||||
class ZMQTest (BitcoinTestFramework):
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.num_nodes = 4
|
||||
|
||||
port = 28332
|
||||
self.num_nodes = 2
|
||||
|
||||
def setup_nodes(self):
|
||||
# Try to import python3-zmq. Skip this test if the import fails.
|
||||
@ -28,7 +28,7 @@ class ZMQTest (BitcoinTestFramework):
|
||||
# Check that dash has been built with ZMQ enabled
|
||||
config = configparser.ConfigParser()
|
||||
if not self.options.configfile:
|
||||
self.options.configfile = os.path.dirname(__file__) + "/config.ini"
|
||||
self.options.configfile = os.path.dirname(__file__) + "/../config.ini"
|
||||
config.read_file(open(self.options.configfile))
|
||||
|
||||
if not config["components"].getboolean("ENABLE_ZMQ"):
|
||||
@ -36,59 +36,66 @@ class ZMQTest (BitcoinTestFramework):
|
||||
|
||||
self.zmqContext = zmq.Context()
|
||||
self.zmqSubSocket = self.zmqContext.socket(zmq.SUB)
|
||||
self.zmqSubSocket.set(zmq.RCVTIMEO, 60000)
|
||||
self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashblock")
|
||||
self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtx")
|
||||
self.zmqSubSocket.connect("tcp://127.0.0.1:%i" % self.port)
|
||||
self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[
|
||||
['-zmqpubhashtx=tcp://127.0.0.1:'+str(self.port), '-zmqpubhashblock=tcp://127.0.0.1:'+str(self.port)],
|
||||
[],
|
||||
[],
|
||||
[]
|
||||
])
|
||||
ip_address = "tcp://127.0.0.1:28332"
|
||||
self.zmqSubSocket.connect(ip_address)
|
||||
extra_args = [['-zmqpubhashtx=%s' % ip_address, '-zmqpubhashblock=%s' % ip_address], []]
|
||||
self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
|
||||
|
||||
def run_test(self):
|
||||
self.sync_all()
|
||||
try:
|
||||
self._zmq_test()
|
||||
finally:
|
||||
# Destroy the zmq context
|
||||
self.log.debug("Destroying zmq context")
|
||||
self.zmqContext.destroy(linger=None)
|
||||
|
||||
def _zmq_test(self):
|
||||
genhashes = self.nodes[0].generate(1)
|
||||
self.sync_all()
|
||||
|
||||
self.log.info("listen...")
|
||||
self.log.info("Wait for tx")
|
||||
msg = self.zmqSubSocket.recv_multipart()
|
||||
topic = msg[0]
|
||||
assert_equal(topic, b"hashtx")
|
||||
body = msg[1]
|
||||
msgSequence = struct.unpack('<I', msg[-1])[-1]
|
||||
assert_equal(msgSequence, 0) #must be sequence 0 on hashtx
|
||||
assert_equal(msgSequence, 0) # must be sequence 0 on hashtx
|
||||
|
||||
self.log.info("Wait for block")
|
||||
msg = self.zmqSubSocket.recv_multipart()
|
||||
topic = msg[0]
|
||||
body = msg[1]
|
||||
msgSequence = struct.unpack('<I', msg[-1])[-1]
|
||||
assert_equal(msgSequence, 0) #must be sequence 0 on hashblock
|
||||
assert_equal(msgSequence, 0) # must be sequence 0 on hashblock
|
||||
blkhash = bytes_to_hex_str(body)
|
||||
|
||||
assert_equal(genhashes[0], blkhash) #blockhash from generate must be equal to the hash received over zmq
|
||||
assert_equal(genhashes[0], blkhash) # blockhash from generate must be equal to the hash received over zmq
|
||||
|
||||
self.log.info("Generate 10 blocks (and 10 coinbase txes)")
|
||||
n = 10
|
||||
genhashes = self.nodes[1].generate(n)
|
||||
self.sync_all()
|
||||
|
||||
zmqHashes = []
|
||||
blockcount = 0
|
||||
for x in range(0,n*2):
|
||||
for x in range(n * 2):
|
||||
msg = self.zmqSubSocket.recv_multipart()
|
||||
topic = msg[0]
|
||||
body = msg[1]
|
||||
if topic == b"hashblock":
|
||||
zmqHashes.append(bytes_to_hex_str(body))
|
||||
msgSequence = struct.unpack('<I', msg[-1])[-1]
|
||||
assert_equal(msgSequence, blockcount+1)
|
||||
assert_equal(msgSequence, blockcount + 1)
|
||||
blockcount += 1
|
||||
|
||||
for x in range(0,n):
|
||||
assert_equal(genhashes[x], zmqHashes[x]) #blockhash from generate must be equal to the hash received over zmq
|
||||
for x in range(n):
|
||||
assert_equal(genhashes[x], zmqHashes[x]) # blockhash from generate must be equal to the hash received over zmq
|
||||
|
||||
#test tx from a second node
|
||||
self.log.info("Wait for tx from second node")
|
||||
# test tx from a second node
|
||||
hashRPC = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.0)
|
||||
self.sync_all()
|
||||
|
||||
@ -96,14 +103,12 @@ class ZMQTest (BitcoinTestFramework):
|
||||
msg = self.zmqSubSocket.recv_multipart()
|
||||
topic = msg[0]
|
||||
body = msg[1]
|
||||
hashZMQ = ""
|
||||
if topic == b"hashtx":
|
||||
hashZMQ = bytes_to_hex_str(body)
|
||||
msgSequence = struct.unpack('<I', msg[-1])[-1]
|
||||
assert_equal(msgSequence, blockcount+1)
|
||||
|
||||
assert_equal(hashRPC, hashZMQ) #blockhash from generate must be equal to the hash received over zmq
|
||||
assert_equal(topic, b"hashtx")
|
||||
hashZMQ = bytes_to_hex_str(body)
|
||||
msgSequence = struct.unpack('<I', msg[-1])[-1]
|
||||
assert_equal(msgSequence, blockcount + 1)
|
||||
|
||||
assert_equal(hashRPC, hashZMQ) # txid from sendtoaddress must be equal to the hash received over zmq
|
||||
|
||||
if __name__ == '__main__':
|
||||
ZMQTest ().main ()
|
||||
ZMQTest().main()
|
||||
|
Loading…
Reference in New Issue
Block a user