Changeset 90674 in webkit


Ignore:
Timestamp:
Jul 8, 2011 5:02:07 PM (13 years ago)
Author:
ojan@chromium.org
Message:

pull static dashboard files into the appengine server from the chromium repository
​https://bugs.webkit.org/show_bug.cgi?id=64208

Reviewed by Dirk Pranke.

These files belong in the WebKit repo since they are tied primarily to the webkit tests.
They have some extra bits to support chromium's gtests, but that seems fine.
Mainly, this will allow other WebKit hackers to hack on the dashboards.

As a nice side-effect, we can now push the dashboard files when we do appengine pushes
instead of the weird thing we used to do of pulling them from the Chromium repository
and storing them in the appengine datastore. This allows for cleaning up a lot of code
and will likely make the dashboards load a bit faster.

The new JS files don't fully match WebKit style, but I'd like to clean that up in a
followup patch if possible to maintain my sanity with this patch.

  • TestResultServer/app.yaml:
  • TestResultServer/handlers/dashboardhandler.py: Removed.
  • TestResultServer/handlers/menu.py:
  • TestResultServer/main.py:
  • TestResultServer/model/dashboardfile.py: Removed.
  • TestResultServer/static-dashboards/LICENSE.dygraph.txt: Added.
  • TestResultServer/static-dashboards/README.dygraph.txt: Added.
  • TestResultServer/static-dashboards/README.webtreemap.txt: Added.
  • TestResultServer/static-dashboards/aggregate_results.html: Added.
  • TestResultServer/static-dashboards/builders.js: Added.
  • TestResultServer/static-dashboards/dashboard_base.js: Added.
  • TestResultServer/static-dashboards/dygraph-combined.js: Added.
  • TestResultServer/static-dashboards/flakiness_dashboard.html: Added.
  • TestResultServer/static-dashboards/flakiness_dashboard_tests.js: Added.
  • TestResultServer/static-dashboards/timeline_explorer.html: Added.
  • TestResultServer/static-dashboards/treemap.html: Added.
  • TestResultServer/static-dashboards/webtreemap.css: Added.
  • TestResultServer/static-dashboards/webtreemap.js: Added.
  • TestResultServer/stylesheets/dashboardfile.css: Removed.
  • TestResultServer/stylesheets/menu.css:
  • TestResultServer/templates/dashboardfilelist.html: Removed.
  • TestResultServer/templates/menu.html:
Location:
trunk/Tools
Files:
14 added
4 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r90672 r90674  
     12011-07-08  Ojan Vafai  <ojan@chromium.org>
     2
     3        pull static dashboard files into the appengine server from the chromium repository
     4        https://bugs.webkit.org/show_bug.cgi?id=64208
     5
     6        Reviewed by Dirk Pranke.
     7
     8        These files belong in the WebKit repo since they are tied primarily to the webkit tests.
     9        They have some extra bits to support chromium's gtests, but that seems fine.
     10        Mainly, this will allow other WebKit hackers to hack on the dashboards.
     11
     12        As a nice side-effect, we can now push the dashboard files when we do appengine pushes
     13        instead of the weird thing we used to do of pulling them from the Chromium repository
     14        and storing them in the appengine datastore. This allows for cleaning up a lot of code
     15        and will likely make the dashboards load a bit faster.
     16
     17        The new JS files don't fully match WebKit style, but I'd like to clean that up in a
     18        followup patch if possible to maintain my sanity with this patch.
     19
     20        * TestResultServer/app.yaml:
     21        * TestResultServer/handlers/dashboardhandler.py: Removed.
     22        * TestResultServer/handlers/menu.py:
     23        * TestResultServer/main.py:
     24        * TestResultServer/model/dashboardfile.py: Removed.
     25        * TestResultServer/static-dashboards/LICENSE.dygraph.txt: Added.
     26        * TestResultServer/static-dashboards/README.dygraph.txt: Added.
     27        * TestResultServer/static-dashboards/README.webtreemap.txt: Added.
     28        * TestResultServer/static-dashboards/aggregate_results.html: Added.
     29        * TestResultServer/static-dashboards/builders.js: Added.
     30        * TestResultServer/static-dashboards/dashboard_base.js: Added.
     31        * TestResultServer/static-dashboards/dygraph-combined.js: Added.
     32        * TestResultServer/static-dashboards/flakiness_dashboard.html: Added.
     33        * TestResultServer/static-dashboards/flakiness_dashboard_tests.js: Added.
     34        * TestResultServer/static-dashboards/timeline_explorer.html: Added.
     35        * TestResultServer/static-dashboards/treemap.html: Added.
     36        * TestResultServer/static-dashboards/webtreemap.css: Added.
     37        * TestResultServer/static-dashboards/webtreemap.js: Added.
     38        * TestResultServer/stylesheets/dashboardfile.css: Removed.
     39        * TestResultServer/stylesheets/menu.css:
     40        * TestResultServer/templates/dashboardfilelist.html: Removed.
     41        * TestResultServer/templates/menu.html:
     42
    1432011-07-08  Adam Roben  <aroben@apple.com>
    244

  • trunk/Tools/TestResultServer/app.yaml

    r56635 r90674  
    88  static_dir: stylesheets
    99
     10- url: /dashboards
     11  static_dir: static-dashboards
     12
    1013- url: /testfile/delete
    11   script: main.py
    12   login: admin
    13 
    14 - url: /dashboards/delete
    1514  script: main.py
    1615  login: admin

  • trunk/Tools/TestResultServer/handlers/menu.py

    r64687 r90674  
    3131from google.appengine.ext.webapp import template
    3232
     33dashboards = [
     34    ["Results", "/dashboards/flakiness_dashboard.html"],
     35    ["Timeline", "/dashboards/timeline_explorer.html"],
     36    ["Treemap", "/dashboards/treemap.html"],
     37    ["Stats", "/dashboards/aggregate_results.html"],
     38]
     39
    3340menu = [
    3441    ["List of test files", "/testfile"],
    … …  
    3643    ["List of expectations.json files", "/testfile?name=expectations.json"],
    3744    ["Upload test file", "/testfile/uploadform"],
    38     ["List of dashboard files", "/dashboards/"],
    39     ["Update dashboard files", "/dashboards/update"],
    4045]
    4146
    … …  
    5863            "login_url": login_url,
    5964            "menu": menu,
     65            "dashboards": dashboards,
    6066        }
    6167

  • trunk/Tools/TestResultServer/main.py

    r64687 r90674  
    3434from google.appengine.ext.webapp.util import run_wsgi_app
    3535
    36 from handlers import dashboardhandler
    3736from handlers import menu
    3837from handlers import testfilehandler
    3938
    4039routes = [
    41     ('/dashboards/delete', dashboardhandler.DeleteDashboardFile),
    42     ('/dashboards/update', dashboardhandler.UpdateDashboardFile),
    43     ('/dashboards/([^?]+)?', dashboardhandler.GetDashboardFile),
    4440    ('/testfile/delete', testfilehandler.DeleteFile),
    4541    ('/testfile/upload', testfilehandler.Upload),

  • trunk/Tools/TestResultServer/stylesheets/menu.css

    r56753 r90674  
    22  font-family: Verdana, Helvetica, sans-serif;
    33}
    4 h1 {
    5   background-color: #EEE;
    6   color: #444;
    7   font-size: 14pt;
    8   font-style: italic;
    9   margin: 0px;
    10   padding: 5px;
    11 }
    124ul {
    13   margin: 0px;
    14   padding: 20px;
    155  list-style: none;
    166}
    177li {
    18   padding: 5px;
     8  padding: 5px 0;
    199}
    20 li:hover {
    21   background-color: #EEE;
    22 }
    23 .login {
    24   font-size: 8pt;
    25   text-align: right;
    26   width: 100%;
    27 }
    28 

  • trunk/Tools/TestResultServer/templates/menu.html

    r56753 r90674  
    33<head>
    44<title>Test Result Server</title>
    5 <table class=login>
    6     <tr>
    7         <td>
    8             {% if user_email %}
    9             <span>{{ user_email }}</span>
    10             {% endif %}
    11             <span><a href="{{ login_url }}">{{ login_text }}</a></span>
    12         </td>
    13     </tr>
    14 </table>
    155<link type="text/css" rel="stylesheet" href="/stylesheets/menu.css" />
    166</head>
    177<body>
    188<h1>Test Result Server</h1>
     9
     10<div class=login>
     11    {% if user_email %}
     12    <span>{{ user_email }}</span>
     13    {% endif %}
     14    <span><a href="{{ login_url }}">{{ login_text }}</a></span>
     15</div>
     16
     17<h2>Dashboards</h2>
     18<div>
     19    <ul>{% for title,link in dashboards %}
     20        <li>
     21            <a href="{{ link }}" >{{ title }}</a>
     22        </li>{% endfor %}
     23    </ul>
     24</div>
     25
     26<h2>JSON files</h2>
    1927<div>
    2028    <ul>{% for title,link in menu %}
Note: See TracChangeset for help on using the changeset viewer.