Changeset 85210 in webkit

Timestamp:

Apr 28, 2011 10:55:03 AM (13 years ago)

Author:

ojan@chromium.org

Message:

2011-04-28 Ojan Vafai <​ojan@chromium.org>

Reviewed by Tony Chang.

link to tests at a specific revision in the results.html file
​https://bugs.webkit.org/show_bug.cgi?id=59711

This matches old-run-webkit-tests.

• fast/harness/resources/results-test.js:
• fast/harness/results-expected.txt:
• fast/harness/results.html:

2011-04-28 Ojan Vafai <​ojan@chromium.org>

Reviewed by Tony Chang.

link to tests at a specific revision in the results.html file
​https://bugs.webkit.org/show_bug.cgi?id=59711

• Scripts/webkitpy/common/checkout/scm.py: Add a method to get the head svn revision.
• Scripts/webkitpy/common/checkout/scm_unittest.py:
• Scripts/webkitpy/layout_tests/layout_package/manager.py: Include the svn revision in the results json.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/harness/resources/results-test.js (modified) (2 diffs)
• LayoutTests/fast/harness/results-expected.txt (modified) (1 diff)
• LayoutTests/fast/harness/results.html (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/common/checkout/scm.py (modified) (3 diffs)
• Tools/Scripts/webkitpy/common/checkout/scm_unittest.py (modified) (6 diffs)
• Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-28  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        link to tests at a specific revision in the results.html file
+        https://bugs.webkit.org/show_bug.cgi?id=59711
+
+        This matches old-run-webkit-tests.
+
+        * fast/harness/resources/results-test.js:
+        * fast/harness/results-expected.txt:
+        * fast/harness/results.html:
+
 2011-04-28  Dominic Cooney  <dominicc@chromium.org>
 

trunk/LayoutTests/fast/harness/resources/results-test.js

@@ -30 +30 @@
         "uses_expectations_file": true,
         "has_pretty_patch": false,
-        "has_wdiff": false
+        "has_wdiff": false,
+        "revision": 12345
     };
 }
@@ -311 +312 @@
         assertTrue(document.querySelectorAll('.zoom-image-container').length == 3);
     });
+    
+    results = mockResults();
+    results.tests['fullscreen/full-screen-api.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
+    runTest(results, function() {
+        var expectedHref = 'file://' + results.layout_tests_dir + '/fullscreen/full-screen-api.html';
+        assertTrue(document.querySelector('tbody td:first-child a').href == expectedHref);
+    });
+    
+    var oldShouldUseTracLinks = shouldUseTracLinks;
+    shouldUseTracLinks = function() { return true; };
+    
+    results = mockResults();
+    results.tests['fullscreen/full-screen-api.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
+    runTest(results, function() {
+        var expectedHref = 'http://trac.webkit.org/export/' + results.revision + '/trunk/LayoutTests/fullscreen/full-screen-api.html';
+        assertTrue(document.querySelector('tbody td:first-child a').href == expectedHref);
+    });
+
+    results = mockResults();
+    results.tests['fullscreen/full-screen-api.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
+    results.revision = '';
+    runTest(results, function() {
+        var expectedHref = 'http://trac.webkit.org/browser/trunk/LayoutTests/fullscreen/full-screen-api.html';
+        assertTrue(document.querySelector('tbody td:first-child a').href == expectedHref);
+    });
+
+    shouldUseTracLinks = oldShouldUseTracLinks;
 
     document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';

trunk/LayoutTests/fast/harness/results-expected.txt

@@ -111 +111 @@
 TEST-23: PASS
 TEST-23: PASS
+TEST-24: PASS
+TEST-25: PASS
+TEST-26: PASS

trunk/LayoutTests/fast/harness/results.html

@@ -266 +266 @@
 }
 
+function shouldUseTracLinks()
+{
+    return !globalState().results.layout_tests_dir || !location.toString().indexOf('file://') == 0;
+}
+
 function testLink(test)
 {
     var basePath;
-    if (globalState().results.layout_tests_dir && location.toString().indexOf('file://') == 0)
+    if (shouldUseTracLinks()) {
+        var revision = globalState().results.revision;
+        basePath = 'http://trac.webkit.org';
+        basePath += revision ? ('/export/' + revision) : '/browser';
+        basePath += '/trunk/LayoutTests/';
+    } else
         basePath = globalState().results.layout_tests_dir + '/';
-    else
-        basePath = 'http://trac.webkit.org/browser/trunk/LayoutTests/';
     return '<span class=expand-button onclick="toggleExpectations(event)"><span class=expand-button-text>+</span></span>' +
         '<a class=test-link href="' + basePath + test + '">' + test + '</a>';

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-28  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        link to tests at a specific revision in the results.html file
+        https://bugs.webkit.org/show_bug.cgi?id=59711
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        Add a method to get the head svn revision.
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+        Include the svn revision in the results json.
+
 2011-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm.py

@@ -272 +272 @@
         self._subclass_must_implement()
 
+    def head_svn_revision(self):
+        self._subclass_must_implement()
+
     def create_patch(self, git_commit=None, changed_files=None):
         self._subclass_must_implement()
@@ -496 +499 @@
         return "svn"
 
+    def head_svn_revision(self):
+        return self.value_from_svn_info(self.checkout_root, 'Revision')
+
     # FIXME: This method should be on Checkout.
     def create_patch(self, git_commit=None, changed_files=None):
@@ -781 +787 @@
         return "git"
 
-    def prepend_svn_revision(self, diff):
+    def head_svn_revision(self):
         git_log = self.run(['git', 'log', '-25'])
         match = re.search("^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ ", git_log, re.MULTILINE)
         if not match:
+            return ""
+        return str(match.group('svn_revision'))
+
+    def prepend_svn_revision(self, diff):
+        revision = self.head_svn_revision()
+        if not revision:
             return diff
 
-        return "Subversion Revision: " + str(match.group('svn_revision')) + '\n' + diff
+        return "Subversion Revision: " + revision + '\n' + diff
 
     def create_patch(self, git_commit=None, changed_files=None):

trunk/Tools/Scripts/webkitpy/common/checkout/scm_unittest.py

@@ -178 +178 @@
         # Change back to a valid directory so that later calls to os.getcwd() do not fail.
         if os.path.isabs(__file__):
-            path = __file__
+            path = os.path.dirname(__file__)
         else:
             path = sys.path[0]
@@ -475 +475 @@
         self.assertFalse(scm.exists('foo.txt'))
 
+    def _shared_test_head_svn_revision(self):
+        self.assertEqual(self.scm.head_svn_revision(), '5')
 
 class SVNTest(SCMTest):
@@ -792 +794 @@
         self.assertTrue("test_file" in self.scm.deleted_files())
 
+    def test_head_svn_revision(self):
+        self._shared_test_head_svn_revision()
+
     def test_propset_propget(self):
         filepath = os.path.join(self.svn_checkout_path, "test_file")
@@ -855 +860 @@
         """Sets up fresh git repository with one commit. Then setups a second git
         repo that tracks the first one."""
+        # FIXME: We should instead clone a git repo that is tracking an SVN repo.
+        # That better matches what we do with WebKit.
         self.original_dir = os.getcwd()
 
@@ -901 +908 @@
         self._shared_test_exists(scm, scm.commit_locally_with_message)
 
+    def test_head_svn_revision(self):
+        scm = detect_scm_system(self.untracking_checkout_path)
+        # If we cloned a git repo tracking an SVG repo, this would give the same result as
+        # self._shared_test_head_svn_revision().
+        self.assertEqual(scm.head_svn_revision(), '')
 
 class GitSVNTest(SCMTest):
@@ -1388 +1400 @@
         self.assertTrue("test_file_commit1" in self.scm.deleted_files())
 
+    def test_head_svn_revision(self):
+        self._shared_test_head_svn_revision()
+
     def test_to_object_name(self):
         relpath = 'test_file_commit1'

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

@@ -47 +47 @@
 import time
 
+from webkitpy.common.checkout import scm
+
 from webkitpy.layout_tests.layout_package import json_layout_results_generator
 from webkitpy.layout_tests.layout_package import json_results_generator
@@ -188 +190 @@
     results['has_wdiff'] = port_obj.wdiff_available()
     results['has_pretty_patch'] = port_obj.pretty_patch_available()
+    results['revision'] = scm.default_scm().head_svn_revision()
 
     return results