From d2d78c482a8097daaa24bc1ba0e66923946dab65 Mon Sep 17 00:00:00 2001 From: Mohammad Azim Khan Date: Tue, 23 Feb 2016 18:17:05 +0000 Subject: [PATCH] Using event decorator instead of manually registering events in setup() --- test/host_tests/tcpecho_client_auto.py | 10 ++++------ test/host_tests/udpecho_client_auto.py | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/test/host_tests/tcpecho_client_auto.py b/test/host_tests/tcpecho_client_auto.py index 073a1bc..c1eb3ab 100644 --- a/test/host_tests/tcpecho_client_auto.py +++ b/test/host_tests/tcpecho_client_auto.py @@ -19,7 +19,7 @@ from threading import Thread from sys import stdout from SocketServer import BaseRequestHandler, TCPServer -from mbed_host_tests import BaseHostTest +from mbed_host_tests import BaseHostTest, event_callback class TCPEchoClientHandler(BaseRequestHandler): @@ -162,6 +162,7 @@ def server_thread_func(this): """ this.server.serve_forever() + @event_callback("target_ip") def _callback_target_ip(self, key, value, timestamp): """ Callback to handle reception of target's IP address. @@ -175,6 +176,7 @@ def _callback_target_ip(self, key, value, timestamp): self.SERVER_IP = self.find_interface_to_target_addr(self.target_ip) self.setup_tcp_server() + @event_callback("host_ip") def _callback_host_ip(self, key, value, timestamp): """ Callback for request for host IP Addr @@ -182,17 +184,13 @@ def _callback_host_ip(self, key, value, timestamp): """ self.send_kv("host_ip", self.SERVER_IP) + @event_callback("host_port") def _callback_host_port(self, key, value, timestamp): """ Callback for request for host port """ self.send_kv("host_port", self.SERVER_PORT) - def setup(self): - self.register_callback("target_ip", self._callback_target_ip) - self.register_callback("host_ip", self._callback_host_ip) - self.register_callback("host_port", self._callback_host_port) - def teardown(self): if self.server: self.server.shutdown() diff --git a/test/host_tests/udpecho_client_auto.py b/test/host_tests/udpecho_client_auto.py index 51bea14..b6e637f 100644 --- a/test/host_tests/udpecho_client_auto.py +++ b/test/host_tests/udpecho_client_auto.py @@ -20,7 +20,7 @@ from sys import stdout from threading import Thread from SocketServer import BaseRequestHandler, UDPServer -from mbed_host_tests import BaseHostTest +from mbed_host_tests import BaseHostTest, event_callback class UDPEchoClientHandler(BaseRequestHandler): @@ -90,6 +90,7 @@ def server_thread_func(this): """ this.server.serve_forever() + @event_callback("target_ip") def _callback_target_ip(self, key, value, timestamp): """ Callback to handle reception of target's IP address. @@ -103,6 +104,7 @@ def _callback_target_ip(self, key, value, timestamp): self.SERVER_IP = self.find_interface_to_target_addr(self.target_ip) self.setup_udp_server() + @event_callback("host_ip") def _callback_host_ip(self, key, value, timestamp): """ Callback for request for host IP Addr @@ -110,17 +112,13 @@ def _callback_host_ip(self, key, value, timestamp): """ self.send_kv("host_ip", self.SERVER_IP) + @event_callback("host_port") def _callback_host_port(self, key, value, timestamp): """ Callback for request for host port """ self.send_kv("host_port", self.SERVER_PORT) - def setup(self): - self.register_callback("target_ip", self._callback_target_ip) - self.register_callback("host_ip", self._callback_host_ip) - self.register_callback("host_port", self._callback_host_port) - def teardown(self): if self.server: self.server.shutdown()