Host test plugins: refactored UDP ECHO SERVER testcase to use test() method instead of run()

workspace_tools/host_tests/udpecho_server_auto.py

@@ -31,12 +31,11 @@ class UDPEchoServerTest(DefaultTest):
     PATTERN_SERVER_IP = "Server IP Address is (\d+).(\d+).(\d+).(\d+):(\d+)"
     re_detect_server_ip = re.compile(PATTERN_SERVER_IP)
 
-    def run(self):
+    def test(self):
         result = True
         serial_ip_msg = self.mbed.serial_readline()
         if serial_ip_msg is None:
-            self.print_result(self.RESULT_IO_SERIAL)
-            return
+            return self.RESULT_IO_SERIAL
         self.notify(serial_ip_msg)
         # Searching for IP address and port prompted by server
         m = self.re_detect_server_ip.search(serial_ip_msg)
@@ -50,9 +49,8 @@ class UDPEchoServerTest(DefaultTest):
                 self.s = socket(AF_INET, SOCK_DGRAM)
             except Exception, e:
                 self.s = None
-                print "HOST: Error: %s" % e
-                self.print_result(self.RESULT_ERROR)
-                exit(-1)
+                self.notify("HOST: Socket error: %s"% e)
+                return self.RESULT_ERROR
 
             for i in range(0, 100):
                 TEST_STRING = str(uuid.uuid4())
@@ -69,20 +67,7 @@ class UDPEchoServerTest(DefaultTest):
 
         if self.s is not None:
             self.s.close()
-
-        self.print_result(self.RESULT_SUCCESS if result else self.RESULT_FAILURE)
-
-        # Receiving
-        try:
-            while True:
-                c = self.mbed.serial_read(512)
-                if c is None:
-                    self.print_result(self.RESULT_IO_SERIAL)
-                    break
-                stdout.write(c)
-                stdout.flush()
-        except KeyboardInterrupt, _:
-            print "\n[CTRL+c] exit"
+        return self.RESULT_SUCCESS if result else self.RESULT_FAILURE
 
 
 if __name__ == '__main__':