Browse Source

qa: Treat mininode p2p exceptions as fatal

Github-Pull: #11319
Rebased-From: a7820422e0
0.15
Suhas Daftuar 7 years ago committed by MarcoFalke
parent
commit
2f0b30a58a
  1. 14
      test/functional/test_framework/mininode.py

14
test/functional/test_framework/mininode.py

@ -1505,6 +1505,7 @@ class NodeConnCB(object):
except: except:
print("ERROR delivering %s (%s)" % (repr(message), print("ERROR delivering %s (%s)" % (repr(message),
sys.exc_info()[0])) sys.exc_info()[0]))
raise
def set_deliver_sleep_time(self, value): def set_deliver_sleep_time(self, value):
with mininode_lock: with mininode_lock:
@ -1708,13 +1709,10 @@ class NodeConn(asyncore.dispatcher):
self.cb.on_close(self) self.cb.on_close(self)
def handle_read(self): def handle_read(self):
try: t = self.recv(8192)
t = self.recv(8192) if len(t) > 0:
if len(t) > 0: self.recvbuf += t
self.recvbuf += t self.got_data()
self.got_data()
except:
pass
def readable(self): def readable(self):
return True return True
@ -1780,8 +1778,10 @@ class NodeConn(asyncore.dispatcher):
self.got_message(t) self.got_message(t)
else: else:
logger.warning("Received unknown command from %s:%d: '%s' %s" % (self.dstaddr, self.dstport, command, repr(msg))) logger.warning("Received unknown command from %s:%d: '%s' %s" % (self.dstaddr, self.dstport, command, repr(msg)))
raise ValueError("Unknown command: '%s'" % (command))
except Exception as e: except Exception as e:
logger.exception('got_data:', repr(e)) logger.exception('got_data:', repr(e))
raise
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:

Loading…
Cancel
Save