Changeset 122251 in webkit

Timestamp:

Jul 10, 2012 12:56:37 PM (12 years ago)

Author:

wangxianzhu@chromium.org

Message:

[Chromium-Android] Use setup_test_runner() instead of start_helper() to setup test environment
​https://bugs.webkit.org/show_bug.cgi?id=90894

Reviewed by Adam Barth.

start_helper() is actually start_pixel_test_helper() since r115601 (bug 81729).
Should use setup_test_runner() to setup test environment for chromium-android.

• Scripts/webkitpy/layout_tests/port/chromium_android.py:

(ChromiumAndroidPort.setup_test_run): Renamed from start_helper(). Added cache cleanup code.
(ChromiumAndroidPort.clean_up_test_run): Renamed from stop_helper().
(ChromiumAndroidPort._path_to_helper): Returns None as we don't have a helper now.
(ChromiumAndroidPort):
(ChromiumAndroidPort._path_to_forwarder): Original _path_to_helper().
(ChromiumAndroidPort._push_executable):
(ChromiumAndroidDriver.init):
(ChromiumAndroidDriver.cmd_line):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_android.py (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-10  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        [Chromium-Android] Use setup_test_runner() instead of start_helper() to setup test environment
+        https://bugs.webkit.org/show_bug.cgi?id=90894
+
+        Reviewed by Adam Barth.
+
+        start_helper() is actually start_pixel_test_helper() since r115601 (bug 81729).
+        Should use setup_test_runner() to setup test environment for chromium-android.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+        (ChromiumAndroidPort.setup_test_run): Renamed from start_helper(). Added cache cleanup code.
+        (ChromiumAndroidPort.clean_up_test_run): Renamed from stop_helper().
+        (ChromiumAndroidPort._path_to_helper): Returns None as we don't have a helper now.
+        (ChromiumAndroidPort):
+        (ChromiumAndroidPort._path_to_forwarder): Original _path_to_helper().
+        (ChromiumAndroidPort._push_executable):
+        (ChromiumAndroidDriver.__init__):
+        (ChromiumAndroidDriver.cmd_line):
+
 2012-07-09  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py

@@ -58 +58 @@
 DRT_APP_PACKAGE = 'org.chromium.native_test'
 DRT_ACTIVITY_FULL_NAME = DRT_APP_PACKAGE + '/.ChromeNativeTestActivity'
-DRT_APP_FILE_DIR = '/data/user/0/' + DRT_APP_PACKAGE + '/files/'
+DRT_APP_DIR = '/data/user/0/' + DRT_APP_PACKAGE + '/'
+DRT_APP_FILES_DIR = DRT_APP_DIR + 'files/'
+DRT_APP_CACHE_DIR = DIR_APP_DIR + 'cache/'
 
 # This only works for single core devices so far.
@@ -236 +238 @@
         pass
 
-    def start_helper(self):
+    def setup_test_run(self):
         self._run_adb_command(['root'])
         self._setup_performance()
@@ -250 +252 @@
         self._synchronize_datetime()
 
+        # Delete the disk cache if any to ensure a clean test run.
+        # This is like what's done in ChromiumPort.setup_test_run but on the device.
+        self._run_adb_command(['shell', 'rm', '-r', DEVICE_APP_CACHE_DIR])
+
         # Start the HTTP server so that the device can access the test cases.
         chromium.ChromiumPort.start_http_server(self, additional_dirs={TEST_PATH_PREFIX: self.layout_tests_dir()})
 
         _log.debug('Starting forwarder')
-        cmd = self._run_adb_command(['shell', '%s %s' % (DEVICE_FORWARDER_PATH, FORWARD_PORTS)])
-
-    def stop_helper(self):
+        self._run_adb_command(['shell', '%s %s' % (DEVICE_FORWARDER_PATH, FORWARD_PORTS)])
+
+    def clean_up_test_run(self):
         # Leave the forwarder and tests httpd server there because they are
         # useful for debugging and do no harm to subsequent tests.
@@ -285 +291 @@
 
     def _path_to_helper(self):
+        return None
+
+    def _path_to_forwarder(self):
         return self._build_path(self.get_option('configuration'), 'forwarder')
 
@@ -321 +330 @@
     def _push_executable(self):
         drt_host_path = self._path_to_driver()
-        forwarder_host_path = self._path_to_helper()
+        forwarder_host_path = self._path_to_forwarder()
         host_stamp = int(float(max(os.stat(drt_host_path).st_mtime,
                                    os.stat(forwarder_host_path).st_mtime)))
@@ -453 +462 @@
     def __init__(self, port, worker_number, pixel_tests, no_timeout=False):
         chromium.ChromiumDriver.__init__(self, port, worker_number, pixel_tests, no_timeout)
-        self._in_fifo_path = DRT_APP_FILE_DIR + 'DumpRenderTree.in'
-        self._out_fifo_path = DRT_APP_FILE_DIR + 'DumpRenderTree.out'
-        self._err_file_path = DRT_APP_FILE_DIR + 'DumpRenderTree.err'
+        self._in_fifo_path = DRT_APP_FILES_DIR + 'DumpRenderTree.in'
+        self._out_fifo_path = DRT_APP_FILES_DIR + 'DumpRenderTree.out'
+        self._err_file_path = DRT_APP_FILES_DIR + 'DumpRenderTree.err'
         self._restart_after_killed = False
         self._read_fifo_proc = None
@@ -468 +477 @@
         for param in original_cmd:
             if param.startswith('--pixel-tests='):
-                self._device_image_path = DRT_APP_FILE_DIR + self._port.host.filesystem.basename(self._image_path)
+                self._device_image_path = DRT_APP_FILES_DIR + self._port.host.filesystem.basename(self._image_path)
                 param = '--pixel-tests=' + self._device_image_path
             cmd.append(param)