Title: [124610] trunk/Tools
Revision
124610
Author
[email protected]
Date
2012-08-03 07:15:37 -0700 (Fri, 03 Aug 2012)

Log Message

[nrwt] fix unit tests after turned pixel testing to be a per test setting
https://bugs.webkit.org/show_bug.cgi?id=93112

Reviewed by Csaba Osztrogonác.

Change unit tests in accordance of per test switching of pixel testing.

* Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py:
(ChromiumAndroidDriverTest.test_command_from_driver_input):
* Scripts/webkitpy/layout_tests/port/driver_unittest.py:
(DriverTest.test_no_timeout):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (124609 => 124610)


--- trunk/Tools/ChangeLog	2012-08-03 14:14:01 UTC (rev 124609)
+++ trunk/Tools/ChangeLog	2012-08-03 14:15:37 UTC (rev 124610)
@@ -1,3 +1,17 @@
+2012-08-03  Balazs Kelemen  <[email protected]>
+
+        [nrwt] fix unit tests after turned pixel testing to be a per test setting
+        https://bugs.webkit.org/show_bug.cgi?id=93112
+
+        Reviewed by Csaba Osztrogonác.
+
+        Change unit tests in accordance of per test switching of pixel testing.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py:
+        (ChromiumAndroidDriverTest.test_command_from_driver_input):
+        * Scripts/webkitpy/layout_tests/port/driver_unittest.py:
+        (DriverTest.test_no_timeout):
+
 2012-08-03  Oswald Buddenhagen  <[email protected]>
 
         [Qt] Populate .qmake.cache from the top-level project file

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py (124609 => 124610)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py	2012-08-03 14:14:01 UTC (rev 124609)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py	2012-08-03 14:15:37 UTC (rev 124610)
@@ -247,11 +247,11 @@
 
     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'checksum\n"
+        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)
 
         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'checksum\n"
+        expected_command = "http://127.0.0.1:8000/foo/bar/test.html'--pixel-test'checksum\n"
         self.assertEquals(self.driver._command_from_driver_input(driver_input), expected_command)
 
 

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py (124609 => 124610)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py	2012-08-03 14:14:01 UTC (rev 124609)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py	2012-08-03 14:15:37 UTC (rev 124610)
@@ -163,7 +163,7 @@
     def test_no_timeout(self):
         port = TestWebKitPort()
         driver = Driver(port, 0, pixel_tests=True, no_timeout=True)
-        self.assertEquals(driver.cmd_line(True, []), ['/mock-build/DumpRenderTree', '--no-timeout', '--pixel-tests', '-'])
+        self.assertEquals(driver.cmd_line(True, []), ['/mock-build/DumpRenderTree', '--no-timeout', '-'])
 
     def test_check_for_driver_crash(self):
         port = TestWebKitPort()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to