Title: [128194] trunk/Tools
- Revision
- 128194
- Author
- pe...@chromium.org
- Date
- 2012-09-11 09:40:47 -0700 (Tue, 11 Sep 2012)
Log Message
Make sure that md5sum is not setup on non-Chromium Android platforms.
https://bugs.webkit.org/show_bug.cgi?id=96393
Patch by Philippe Liard <pli...@google.com> on 2012-09-11
Reviewed by Adam Barth.
Previously md5sum was setup in ChromiumAndroidDriver's constructor
which is also invoked on non-Chromium Android platforms. The following patch
moves this logic to _startup_test() which is guaranteed to be invoked
only on Android.
This also updates the prompt unit test in chromium_android_unittest.py.
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidDriver.__init__):
(ChromiumAndroidDriver._setup_md5sum_and_push_data_if_needed):
(ChromiumAndroidDriver._setup_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128193 => 128194)
--- trunk/Tools/ChangeLog 2012-09-11 16:08:22 UTC (rev 128193)
+++ trunk/Tools/ChangeLog 2012-09-11 16:40:47 UTC (rev 128194)
@@ -1,3 +1,22 @@
+2012-09-11 Philippe Liard <pli...@google.com>
+
+ Make sure that md5sum is not setup on non-Chromium Android platforms.
+ https://bugs.webkit.org/show_bug.cgi?id=96393
+
+ Reviewed by Adam Barth.
+
+ Previously md5sum was setup in ChromiumAndroidDriver's constructor
+ which is also invoked on non-Chromium Android platforms. The following patch
+ moves this logic to _startup_test() which is guaranteed to be invoked
+ only on Android.
+
+ This also updates the prompt unit test in chromium_android_unittest.py.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidDriver.__init__):
+ (ChromiumAndroidDriver._setup_md5sum_and_push_data_if_needed):
+ (ChromiumAndroidDriver._setup_test):
+
2012-09-11 Raphael Kubo da Costa <rak...@webkit.org>
[EFL] Rewrite the EFL-related Find modules
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (128193 => 128194)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-09-11 16:08:22 UTC (rev 128193)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-09-11 16:40:47 UTC (rev 128194)
@@ -309,8 +309,6 @@
class ChromiumAndroidDriver(driver.Driver):
- _data_already_pushed_for_worker = sets.Set()
-
def __init__(self, port, worker_number, pixel_tests, no_timeout=False):
super(ChromiumAndroidDriver, self).__init__(port, worker_number, pixel_tests, no_timeout)
self._cmd_line = None
@@ -324,30 +322,28 @@
self._original_governors = {}
self._device_serial = port._get_device_serial(worker_number)
self._adb_command = ['adb', '-s', self._device_serial]
- self._setup_md5sum()
- if not worker_number in ChromiumAndroidDriver._data_already_pushed_for_worker:
- self._push_executable()
- self._push_fonts()
- self._push_test_resources()
- ChromiumAndroidDriver._data_already_pushed_for_worker.add(worker_number)
def __del__(self):
self._teardown_performance()
super(ChromiumAndroidDriver, self).__del__()
- def _setup_md5sum(self):
+ def _setup_md5sum_and_push_data_if_needed(self):
self._md5sum_path = self._port._build_path_with_configuration(self._port.get_option('configuration'), MD5SUM_DEVICE_FILE_NAME)
assert os.path.exists(self._md5sum_path)
- if self._file_exists_on_device(MD5SUM_DEVICE_PATH):
- return
- if not self._push_to_device(self._md5sum_path, MD5SUM_DEVICE_PATH):
- _log.error('Could not push md5sum to device')
+ if not self._file_exists_on_device(MD5SUM_DEVICE_PATH):
+ if not self._push_to_device(self._md5sum_path, MD5SUM_DEVICE_PATH):
+ _log.error('Could not push md5sum to device')
+ self._push_executable()
+ self._push_fonts()
+ self._push_test_resources()
+
def _setup_test(self):
if self._has_setup:
return
+ self._setup_md5sum_and_push_data_if_needed()
self._has_setup = True
self._run_adb_command(['root'])
self._setup_performance()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py (128193 => 128194)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py 2012-09-11 16:08:22 UTC (rev 128193)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py 2012-09-11 16:40:47 UTC (rev 128194)
@@ -240,7 +240,7 @@
self.driver._server_process = driver_unittest.MockServerProcess(lines=['root@android:/ # '])
self.assertEquals(self.driver._read_prompt(time.time() + 1), None)
self.driver._server_process = driver_unittest.MockServerProcess(lines=['$ '])
- self.assertRaises(AssertionError, self.driver._read_prompt, time.time() + 1)
+ self.assertEquals(self.driver._read_prompt(time.time() + 1), None)
def test_command_from_driver_input(self):
driver_input = driver.DriverInput('foo/bar/test.html', 10, 'checksum', True)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
