DRT/WTR python interface handles about:blank incorrectly

https://bugs.webkit.org/show_bug.cgi?id=89563

Reviewed by Dirk Pranke.

Currently DRT/WTR python interface's _command_from_driver_input function
puts the test directory path before about:blank. Remove this incorrect behavior.

* Scripts/webkitpy/layout_tests/port/webkit.py:
(WebKitDriver._command_from_driver_input):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 738006c..1f2786c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2012-06-21  Zoltan Horvath  <zoltan@webkit.org>
+
+        DRT/WTR python interface handles about:blank incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=89563
+
+        Reviewed by Dirk Pranke.
+
+        Currently DRT/WTR python interface's _command_from_driver_input function
+        puts the test directory path before about:blank. Remove this incorrect behavior.
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        (WebKitDriver._command_from_driver_input):
+
 2012-06-21  Dirk Pranke  <dpranke@chromium.org>
 
         reenable perf tests on win

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
old mode 100644 (file)
new mode 100755 (executable)
index ab35a64..2a1e6e8
--- a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -525,7 +525,7 @@ class WebKitDriver(Driver):
 
     def _command_from_driver_input(self, driver_input):
         # FIXME: performance tests pass in full URLs instead of test names.
-        if driver_input.test_name.startswith('http://') or driver_input.test_name.startswith('https://'):
+        if driver_input.test_name.startswith('http://') or driver_input.test_name.startswith('https://')  or driver_input.test_name == ('about:blank'):
             command = driver_input.test_name
         elif self.is_http_test(driver_input.test_name):
             command = self.test_to_uri(driver_input.test_name)