commit 9b4f0cba6e9b0418b3963ce1ad69f930e88e1bc5
author Keun Soo Yim <yim@google.com> Wed Jul 20 10:08:59 2016 -0700
committer Keun Soo Yim <yim@google.com> Wed Jul 20 17:12:47 2016 +0000
tree ab8fc19f7bea2fb797c42dec499900dd7abdcf24
parent a35b727a40eddc7bd4c73e562388b022a54d1a9d

callback testcase extension

also contain small bug fixes for runner callback arg extension

Change-Id: I1287d41dd86a03d5de175b56ba190330e9ce624c

utils/python/controllers/android_device.py

diff --git a/utils/python/controllers/android_device.py b/utils/python/controllers/android_device.py
index b739ac8..289f763 100644
--- a/utils/python/controllers/android_device.py
+++ b/utils/python/controllers/android_device.py
@@ -118,7 +118,7 @@
     for ad in ads:
         running_ads.append(ad)
         try:
-            ad.start_services()
+            ad.startServices()
         except:
             ad.log.exception("Failed to start some services, abort!")
             destroy(running_ads)

utils/python/mirror/hal_mirror.py

diff --git a/utils/python/mirror/hal_mirror.py b/utils/python/mirror/hal_mirror.py
index 9e4a6d8..cd1e348 100644
--- a/utils/python/mirror/hal_mirror.py
+++ b/utils/python/mirror/hal_mirror.py
@@ -23,7 +23,7 @@
 from vts.proto import AndroidSystemControlMessage_pb2 as ASysCtrlMsg
 from vts.proto import InterfaceSpecificationMessage_pb2 as IfaceSpecMsg
 from vts.runners.host.tcp_client import vts_tcp_client
-from vts.runners.host.tcp_server import vts_tcp_server
+from vts.runners.host.tcp_server import callback_server
 from vts.utils.python.mirror import mirror_object
 
 COMPONENT_CLASS_DICT = {"hal_conventional": 1,
@@ -177,9 +177,9 @@
             errors.ComponentLoadingError is raised if the callback server fails
             to start.
         """
-        self._callback_server = vts_tcp_server.VtsTcpServer()
-        _, port = self._callback_server.Start(self.host_callback_port)
-        if port != self.host_callback_port:
+        self._callback_server = callback_server.CallbackServer()
+        _, port = self._callback_server.Start(self._host_callback_port)
+        if port != self._host_callback_port:
             raise errors.ComponentLoadingError(
                 "Failed to start a callback TcpServer at port %s" %
                 self._host_callback_port)
@@ -283,7 +283,7 @@
 
         # Instantiate a MirrorObject and return it.
         hal_mirror = mirror_object.MirrorObject(client, if_spec_msg,
-                                                callback_server)
+                                                self._callback_server)
         self._hal_level_mirrors[handler_name] = hal_mirror
 
     def __getattr__(self, name):