Title: [104264] trunk/Tools
- Revision
- 104264
- Author
- [email protected]
- Date
- 2012-01-05 19:20:50 -0800 (Thu, 05 Jan 2012)
Log Message
Don't hardcode expected file URIs in as they depend on the platform
https://bugs.webkit.org/show_bug.cgi?id=75666
Reviewed by Dirk Pranke.
* Scripts/webkitpy/layout_tests/port/win.py:
(WinPort.show_results_html_file):
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(MainTest.test_unexpected_failures):
(MainTest.test_results_directory_default):
(MainTest.test_results_directory_relative):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104263 => 104264)
--- trunk/Tools/ChangeLog 2012-01-06 03:14:05 UTC (rev 104263)
+++ trunk/Tools/ChangeLog 2012-01-06 03:20:50 UTC (rev 104264)
@@ -1,3 +1,17 @@
+2012-01-05 Jochen Eisinger <[email protected]>
+
+ Don't hardcode expected file URIs in as they depend on the platform
+ https://bugs.webkit.org/show_bug.cgi?id=75666
+
+ Reviewed by Dirk Pranke.
+
+ * Scripts/webkitpy/layout_tests/port/win.py:
+ (WinPort.show_results_html_file):
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_unexpected_failures):
+ (MainTest.test_results_directory_default):
+ (MainTest.test_results_directory_relative):
+
2012-01-05 Anders Carlsson <[email protected]>
Crash when trying to invalidate the NPRuntimeObjectMap for a plug-in in a subframe
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py (104263 => 104264)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2012-01-06 03:14:05 UTC (rev 104263)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2012-01-06 03:20:50 UTC (rev 104264)
@@ -31,7 +31,7 @@
import sys
from webkitpy.common.system.executive import ScriptError
-from webkitpy.common.system.path import cygpath
+from webkitpy.common.system.path import abspath_to_uri
from webkitpy.layout_tests.port.apple import ApplePort
@@ -109,7 +109,7 @@
return 'win'
def show_results_html_file(self, results_filename):
- self._run_script('run-safari', [cygpath(results_filename)])
+ self._run_script('run-safari', [abspath_to_uri(results_filename)])
# FIXME: webkitperl/httpd.pm installs /usr/lib/apache/libphp4.dll on cycwin automatically
# as part of running old-run-webkit-tests. That's bad design, but we may need some similar hack.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (104263 => 104264)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-01-06 03:14:05 UTC (rev 104263)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-01-06 03:20:50 UTC (rev 104264)
@@ -433,7 +433,7 @@
self.assertEqual(res, unexpected_tests_count)
self.assertFalse(out.empty())
self.assertFalse(err.empty())
- self.assertEqual(user.opened_urls, ['file:///tmp/layout-test-results/results.html'])
+ self.assertEqual(user.opened_urls, [path.abspath_to_uri('/tmp/layout-test-results/results.html')])
def test_missing_and_unexpected_results(self):
# Test that we update expectations in place. If the expectation
@@ -614,7 +614,7 @@
# This is the default location.
res, out, err, user = logging_run(tests_included=True)
- self.assertEqual(user.opened_urls, ['file:///tmp/layout-test-results/results.html'])
+ self.assertEqual(user.opened_urls, [path.abspath_to_uri('/tmp/layout-test-results/results.html')])
def test_results_directory_relative(self):
# We run a configuration that should fail, to generate output, then
@@ -624,7 +624,7 @@
host.filesystem.chdir('/tmp/cwd')
res, out, err, user = logging_run(['--results-directory=foo'],
tests_included=True, host=host)
- self.assertEqual(user.opened_urls, ['file:///tmp/cwd/foo/results.html'])
+ self.assertEqual(user.opened_urls, [path.abspath_to_uri('/tmp/cwd/foo/results.html')])
def test_retries_directory(self):
host = MockHost()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
