From 1f76e0e7711bab92a12acf11ee0ea13c958b6595 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 25 Nov 2012 13:08:14 -0800 Subject: Change tests['suite']['testname'] to simply tests['testname'] --- framework/database.py | 2 +- programs/run.py | 4 ++-- suites/__init__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/database.py b/framework/database.py index b441ad5..ad0f93b 100644 --- a/framework/database.py +++ b/framework/database.py @@ -57,4 +57,4 @@ class ResultDatabase: def createRun(self, name, driver, sysinfo): cursor = self.connection.cursor() date = int(time.time()) - cursor.execute('INSERT INTO runs values(?,?,?,?)', (date, name, driver, sysinfo)) + cursor.execute('INSERT INTO runs VALUES(?,?,?,?)', (date, name, driver, sysinfo)) diff --git a/programs/run.py b/programs/run.py index b92b91d..e0cbb99 100755 --- a/programs/run.py +++ b/programs/run.py @@ -73,8 +73,8 @@ def main(argv, config): tests = suites.loadTestLists(config, args.suites) - #for test in sorted(tests['oglconform'].keys()): - #print(test) + #for test in sorted(tests.keys()): + # print(test) db = ResultDatabase(config) diff --git a/suites/__init__.py b/suites/__init__.py index f7d5dd3..ec5a42a 100644 --- a/suites/__init__.py +++ b/suites/__init__.py @@ -33,7 +33,7 @@ def loadTestLists(config, desiredSuites): tests = {} for suite, plugin in suites.items(): if not desiredSuites or suite in desiredSuites: - tests[suite] = plugin.makeTestList() + tests.update(plugin.makeTestList()) return tests -- cgit v1.2.3