Mercurial > mozilla > hg > talosnames
changeset 33:15f17eeb1813
full test data
author | Jeff Hammel <jhammel@mozilla.com> |
---|---|
date | Mon, 23 Jul 2012 13:47:51 -0700 |
parents | 1a9ec766f2b0 |
children | b51b0d750086 |
files | talosnames/api.py talosnames/templates/index.html |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/talosnames/api.py Mon Jul 23 13:22:29 2012 -0700 +++ b/talosnames/api.py Mon Jul 23 13:47:51 2012 -0700 @@ -5,6 +5,7 @@ import sqlite3 import sys import talos +import talos.run_tests import tempfile import urllib2 import yaml @@ -128,7 +129,9 @@ return config def test_config(self, name): - test_config = self.talos_config(name)['tests'] + config = self.talos_config(name) + test_config = config['tests'] + talos.run_tests.useBaseTestDefaults(config.get('basetest', {}), test_config) retval = {} for test in test_config: name = test.pop('name')
--- a/talosnames/templates/index.html Mon Jul 23 13:22:29 2012 -0700 +++ b/talosnames/templates/index.html Mon Jul 23 13:47:51 2012 -0700 @@ -59,13 +59,15 @@ <script> $(document).ready(function() { +// color paint/chrome boxes appropriately + + +// add TBPL initials to TBPL names from Config.js $('td.tbpl').each(function() { - var text = $(this).text(); if (text.length && Config.testNames[text]) { $(this).html(text + '(<span class="tbpl_initial">' + Config.testNames[text] + '</span>)'); } - }); });