functional test: remove the added callbacks before exiting

Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>

Author: tatianaleon

functional_tests/configuration/reset.py

@@ -30,14 +30,14 @@ def main():
 
     device = XBeeDevice(PORT, BAUD_RATE)
 
+    def modem_status_callback(status):
+        if status == ModemStatus.COORDINATOR_STARTED:
+            return
+        assert (status in [ModemStatus.HARDWARE_RESET, ModemStatus.WATCHDOG_TIMER_RESET])
+
     try:
         device.open()
 
-        def modem_status_callback(status):
-            if status == ModemStatus.COORDINATOR_STARTED:
-                return
-            assert (status in [ModemStatus.HARDWARE_RESET, ModemStatus.WATCHDOG_TIMER_RESET])
-
         device.add_modem_status_received_callback(modem_status_callback)
 
         for i in range(10):
@@ -47,6 +47,8 @@ def modem_status_callback(status):
         print("Test finished successfully")
 
     finally:
+        device.del_modem_status_received_callback(modem_status_callback)
+
         if device is not None and device.is_open():
             device.close()
 

functional_tests/long_test.py

@@ -47,6 +47,13 @@ def main(argv):
 
     device = ZigBeeDevice(port, baud_rate)
 
+    # Add a data received callback.
+    def data_callback(message):
+        if message.remote_device.get_64bit_addr() == remote.get_64bit_addr():
+            print("%s - [C] - %s" % (datetime.datetime.now(), message.data.decode()))
+            # Ensure that the sent and received messages are equal.
+            assert (data == message.data.decode())
+
     try:
         device.open()
 
@@ -77,13 +84,6 @@ def main(argv):
 
         print("Selected remote device: %s" % remote)
 
-        # Add a data received callback.
-        def data_callback(message):
-            if message.remote_device.get_64bit_addr() == remote.get_64bit_addr():
-                print("%s - [C] - %s" % (datetime.datetime.now(), message.data.decode()))
-                # Ensure that the sent and received messages are equal.
-                assert (data == message.data.decode())
-
         device.add_data_received_callback(data_callback)
 
         print("Sending data...\n")
@@ -116,6 +116,9 @@ def data_callback(message):
         print("\nTest finished successfully")
 
     finally:
+
+        device.del_data_received_callback(data_callback)
+
         if device is not None and device.is_open():
             device.close()
 

functional_tests/network/discover_network.py

@@ -31,16 +31,16 @@ def main():
 
     device = XBeeDevice(PORT, BAUD_RATE)
 
+    def device_discovered_callback(remote):
+        devices_callback.append(remote)
+
     try:
         device.open()
 
         network = device.get_network()
 
         devices_callback = []
 
-        def device_discovered_callback(remote):
-            devices_callback.append(remote)
-
         network.add_device_discovered_callback(device_discovered_callback)
 
         network.start_discovery_process()
@@ -53,6 +53,8 @@ def device_discovered_callback(remote):
         print("Test finished successfully")
 
     finally:
+        network.del_device_discovered_callback(device_discovered_callback)
+
         if device is not None and device.is_open():
             device.close()