def onReceive(packet, interface):
"""Callback invoked when a packet arrives"""
if sendingInterface == interface:
- print("Ignoring sending interface")
+ pass
+ # print("Ignoring sending interface")
else:
# print(f"From {interface.stream.port}: {packet}")
p = DotMap(packet)
@@ -250,6 +261,48 @@ def testAll():
return open(debugname, 'w+', buffering=1)
+def runTests(numTests=50, wantAck=False, maxFailures=0)
+def runTests(numTests=50, wantAck=False, maxFailures=0):
+ logging.info(f"Running {numTests} tests with wantAck={wantAck}")
+ numFail = 0
+ numSuccess = 0
+ for i in range(numTests):
+ global testNumber
+ testNumber = testNumber + 1
+ isBroadcast = True
+ # asBinary=(i % 2 == 0)
+ success = testSend(
+ interfaces[0], interfaces[1], isBroadcast, asBinary=False, wantAck=wantAck)
+ if not success:
+ numFail = numFail + 1
+ logging.error(
+ f"Test failed, expected packet not received ({numFail} failures so far)")
+ else:
+ numSuccess = numSuccess + 1
+ logging.info(
+ f"Test succeeded {numSuccess} successes {numFail} failures so far")
+
+ #if numFail >= 3:
+ # for i in interfaces:
+ # i.close()
+ # return
+
+ time.sleep(1)
+
+ if numFail > maxFailures:
+ logging.error("Too many failures! Test failed!")
+
+ return numFail
def subscribe()
-def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False)
+def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False, wantAck=False)
Sends one test packet between two nodes and then returns success or failure
@@ -317,7 +370,7 @@ toInterface {[type]} – [description]def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False):
+def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False, wantAck=False):
"""
Sends one test packet between two nodes and then returns success or failure
@@ -337,8 +390,7 @@ toInterface {[type]} – [description]
else:
toNode = toInterface.myInfo.my_node_num
- logging.info(f"Sending test packet from {fromNode} to {toNode}")
- wantAck = False # Don't want any sort of reliaible sending
+ logging.debug(f"Sending test wantAck={wantAck} packet from {fromNode} to {toNode}")
global sendingInterface
sendingInterface = fromInterface
if not asBinary:
@@ -346,7 +398,7 @@ toInterface {[type]} – [description]
else:
fromInterface.sendData((f"Binary {testNumber}").encode(
"utf-8"), toNode, wantAck=wantAck)
- for sec in range(45): # max of 45 secs before we timeout
+ for sec in range(60): # max of 60 secs before we timeout
time.sleep(1)
if (len(receivedPackets) >= 1):
return True
@@ -364,30 +416,8 @@ toInterface {[type]} – [description]
def testThread(numTests=50):
logging.info("Found devices, starting tests...")
- numFail = 0
- numSuccess = 0
- for i in range(numTests):
- global testNumber
- testNumber = testNumber + 1
- isBroadcast = True
- # asBinary=(i % 2 == 0)
- success = testSend(
- interfaces[0], interfaces[1], isBroadcast, asBinary=False)
- if not success:
- numFail = numFail + 1
- logging.error(
- f"Test failed, expected packet not received ({numFail} failures so far)")
- else:
- numSuccess = numSuccess + 1
- logging.info(
- f"Test succeeded ({numSuccess} successes ({numFail} failures) so far)")
-
- if numFail >= 3:
- for i in interfaces:
- i.close()
- return
-
- time.sleep(1)
+ runTests(numTests, wantAck=True)
+ runTests(numTests, wantAck=False, maxFailures=5) # Allow a few dropped packets
@@ -417,6 +447,7 @@ toInterface {[type]} – [description]
onNodeonReceiveopenDebugLogrunTestssubscribetestAlltestSend