Add test and test_result classes.

diff --git a/buildfarm/build.py b/buildfarm/build.py
index 7f24a0862d29a8605a4996afda76b1618ad770f0..b0938dc2cc17eec63f76e423db3019f22914b440 100644 (file)
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -29,6 +29,21 @@ import re
 import time
 
 
+class Test(object):
+
+    def __init__(self, name):
+        self.name = name
+
+
+
+class TestResult(object):
+
+    def __init__(self, build, test, result):
+        self.build = build
+        self.test = test
+        self.result = result
+
+
 class BuildSummary(object):
 
     def __init__(self, host, tree, compiler, revision, status):

diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index 8aa2cf85fead330952e30fb02d9bd86db9e2b1f0..bc1328fca0ee3108038487d2801bbd98a950258f 100644 (file)
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -26,6 +26,8 @@ from buildfarm.build import (
     BuildResultStore,
     BuildStatus,
     NoSuchBuildError,
+    Test,
+    TestResult,
     )
 from buildfarm.hostdb import (
     Host,
@@ -41,7 +43,7 @@ except ImportError:
     import sqlite3
 from storm.database import create_database
 from storm.expr import EXPR, FuncExpr, compile
-from storm.locals import Bool, Desc, Int, Unicode, RawStr
+from storm.locals import Bool, Desc, Int, RawStr, Reference, Unicode
 from storm.store import Store
 
 
@@ -325,6 +327,24 @@ class StormTree(Tree):
     scm = RawStr()
 
 
+class StormTest(Test):
+    __storm_table__ = "test"
+
+    id = Int(primary=True)
+    name = RawStr()
+
+
+class StormTestResult(TestResult):
+    __storm_table__ = "test_result"
+
+    id = Int(primary=True)
+    build_id = Int(name="build")
+    build = Reference(build_id, StormBuild)
+
+    test_id = Int(name="test")
+    test = Reference(test_id, StormTest)
+
+
 def setup_schema(db):
     db.execute("PRAGMA foreign_keys = 1;", noresult=True)
     db.execute("""
@@ -383,6 +403,19 @@ CREATE TABLE IF NOT EXISTS compiler (
     db.execute("""
 CREATE UNIQUE INDEX IF NOT EXISTS unique_compiler_name ON compiler(name);
 """, noresult=True)
+    db.execute("""
+CREATE TABLE IF NOT EXISTS test (
+    id integer primary key autoincrement,
+    name text not null);
+    """, noresult=True)
+    db.execute("CREATE UNIQUE INDEX IF NOT EXISTS test_name ON test(name);",
+        noresult=True)
+    db.execute("""CREATE TABLE IF NOT EXISTS test_result (
+        build int,
+        test int,
+        result int
+        );""", noresult=True)
+    db.execute("""CREATE UNIQUE INDEX IF NOT EXISTS build_test_result ON test_result(build, test);""", noresult=True)
 
 
 def memory_store():