Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / build / android / pylib / host_driven / test_case.py

diff --git a/src/build/android/pylib/host_driven/test_case.py b/src/build/android/pylib/host_driven/test_case.py
index 5824a66..a5ef747 100644 (file)
--- a/src/build/android/pylib/host_driven/test_case.py
+++ b/src/build/android/pylib/host_driven/test_case.py
@@ -24,10 +24,11 @@ import logging
 import os
 import time
 
-from pylib import android_commands
+from pylib import constants
 from pylib import forwarder
 from pylib import valgrind_tools
 from pylib.base import base_test_result
+from pylib.device import device_utils
 from pylib.instrumentation import test_package
 from pylib.instrumentation import test_result
 from pylib.instrumentation import test_runner
@@ -51,6 +52,7 @@ class HostDrivenTestCase(object):
     class_name = self.__class__.__name__
     self.adb = None
     self.cleanup_test_files = False
+    self.device = None
     self.device_id = ''
     self.has_forwarded_ports = False
     self.instrumentation_options = instrumentation_options
@@ -72,7 +74,8 @@ class HostDrivenTestCase(object):
       ports_to_forward = []
     self.device_id = device
     self.shard_index = shard_index
-    self.adb = android_commands.AndroidCommands(self.device_id)
+    self.device = device_utils.DeviceUtils(self.device_id)
+    self.adb = self.device.old_interface
     self.push_deps = push_deps
     self.cleanup_test_files = cleanup_test_files
     if ports_to_forward:
@@ -83,7 +86,8 @@ class HostDrivenTestCase(object):
 
   # TODO(craigdh): Remove GetOutDir once references have been removed
   # downstream.
-  def GetOutDir(self):
+  @staticmethod
+  def GetOutDir():
     return constants.GetOutDirectory()
 
   def Run(self):
@@ -102,9 +106,9 @@ class HostDrivenTestCase(object):
                     self.has_forwarded_ports)
     if self.ports_to_forward and not self.has_forwarded_ports:
       self.has_forwarded_ports = True
-      tool = valgrind_tools.CreateTool(None, self.adb)
+      tool = valgrind_tools.CreateTool(None, self.device)
       forwarder.Forwarder.Map([(port, port) for port in self.ports_to_forward],
-                              self.adb, tool)
+                              self.device, tool)
 
   def __RunJavaTest(self, test, test_pkg, additional_flags=None):
     """Runs a single Java test in a Java TestRunner.