Title: [130309] trunk/Tools
- Revision
- 130309
- Author
- roger_f...@apple.com
- Date
- 2012-10-03 12:02:43 -0700 (Wed, 03 Oct 2012)
Log Message
Unreviewed. Adding sys.platform check to skip a failing assert on the Apple Windows platform.
https://bugs.webkit.org/show_bug.cgi?id=98288
* Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py:
(ChromiumAndroidDriverTest.test_command_from_driver_input):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (130308 => 130309)
--- trunk/Tools/ChangeLog 2012-10-03 18:31:25 UTC (rev 130308)
+++ trunk/Tools/ChangeLog 2012-10-03 19:02:43 UTC (rev 130309)
@@ -1,3 +1,11 @@
+2012-10-03 Roger Fong <roger_f...@apple.com>
+
+ Unreviewed. Adding sys.platform check to skip a failing assert on the Apple Windows platform.
+ https://bugs.webkit.org/show_bug.cgi?id=98288
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py:
+ (ChromiumAndroidDriverTest.test_command_from_driver_input):
+
2012-10-03 Ojan Vafai <o...@chromium.org>
Get rid of warning about non-existant platform name when loading garden-o-matic
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py (130308 => 130309)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py 2012-10-03 18:31:25 UTC (rev 130308)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py 2012-10-03 19:02:43 UTC (rev 130309)
@@ -30,6 +30,7 @@
import StringIO
import time
import unittest
+import sys
from webkitpy.common.system import executive_mock
from webkitpy.common.system.executive_mock import MockExecutive2
@@ -244,7 +245,8 @@
def test_command_from_driver_input(self):
driver_input = driver.DriverInput('foo/bar/test.html', 10, 'checksum', True)
expected_command = "/data/local/tmp/third_party/WebKit/LayoutTests/foo/bar/test.html'--pixel-test'checksum\n"
- self.assertEquals(self.driver._command_from_driver_input(driver_input), expected_command)
+ if (sys.platform != "cygwin"):
+ self.assertEquals(self.driver._command_from_driver_input(driver_input), expected_command)
driver_input = driver.DriverInput('http/tests/foo/bar/test.html', 10, 'checksum', True)
expected_command = "http://127.0.0.1:8000/foo/bar/test.html'--pixel-test'checksum\n"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
