sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #10124: [test] Suppress test logging spam

Browse Source 
45ce471 Reduce spammy test logging (John Newbery)

Tree-SHA512: 64b2ce29fb62a4e738840bbaf93563559451c2ef078ba66ecfc1dbe34adefea61ad2ad2d768444cb2e0b30cb3cbe47e38ed818d4c91f7723a3d1ba9fdd0043f9
This commit is contained in:
MarcoFalke 2017-04-08 12:33:14 +02:00 committed by Pasta
parent a54ff70ff4
commit f893ac66ca
No known key found for this signature in database
GPG Key ID: 0B8EB7A31A44D9C6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/functional/test_framework/mininode.py
View File

@ -1886,7 +1886,7 @@ class NodeConn(asyncore.dispatcher):
def send_message(self, message, pushbuf=False): def send_message(self, message, pushbuf=False):
if self.state != "connected" and not pushbuf: if self.state != "connected" and not pushbuf:
raise IOError('Not connected, no pushbuf') raise IOError('Not connected, no pushbuf')
logger.debug("Send message to %s:%d: %s" % (self.dstaddr, self.dstport, repr(message))) self._log_message("send", message)
command = message.command command = message.command
data = message.serialize() data = message.serialize()
tmsg = self.MAGIC_BYTES[self.network] tmsg = self.MAGIC_BYTES[self.network]
@ -1908,9 +1908,19 @@ class NodeConn(asyncore.dispatcher):
self.messagemap[b'ping'] = msg_ping_prebip31 self.messagemap[b'ping'] = msg_ping_prebip31
if self.last_sent + 30 * 60 < time.time(): if self.last_sent + 30 * 60 < time.time():
self.send_message(self.messagemap[b'ping']()) self.send_message(self.messagemap[b'ping']())
logger.debug("Received message from %s:%d: %s" % (self.dstaddr, self.dstport, repr(message))) self._log_message("receive", message)
self.cb.deliver(self, message) self.cb.deliver(self, message)
def _log_message(self, direction, msg):
if direction == "send":
log_message = "Send message to "
elif direction == "receive":
log_message = "Received message from "
log_message += "%s:%d: %s" % (self.dstaddr, self.dstport, repr(msg)[:500])
if len(log_message) > 500:
log_message += "... (msg truncated)"
logger.debug(log_message)
def disconnect_node(self): def disconnect_node(self):
self.disconnect = True self.disconnect = True

2
test/functional/test_framework/util.py
View File

@ -343,7 +343,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
if binary is None: if binary is None:
binary = os.getenv("BITCOIND", "dashd") binary = os.getenv("BITCOIND", "dashd")
# RPC tests still depend on free transactions # RPC tests still depend on free transactions
args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000", "-logtimemicros", "-debug", "-mocktime="+str(get_mocktime()) ] args = [binary, "-datadir=" + datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000", "-logtimemicros", "-debug", "-debugexclude=libevent", "-debugexclude=leveldb", "-mocktime=" + str(get_mocktime())]
# Don't try auto backups (they fail a lot when running tests) # Don't try auto backups (they fail a lot when running tests)
args += [ "-createwalletbackups=0" ] args += [ "-createwalletbackups=0" ]
if extra_args is not None: args.extend(extra_args) if extra_args is not None: args.extend(extra_args)