# HG changeset patch # User Jeff Hammel # Date 1343076471 25200 # Node ID 15f17eeb1813bd34702e699a81328c77f833bfd5 # Parent 1a9ec766f2b0ebadf9a15db1c6c0e4d73258f117 full test data diff -r 1a9ec766f2b0 -r 15f17eeb1813 talosnames/api.py --- 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') diff -r 1a9ec766f2b0 -r 15f17eeb1813 talosnames/templates/index.html --- 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 @@