Overhaul database package

golden/go/expstorage/expstorage_test.go

 package expstorage
 
 import (
         "testing"
 )
 
 import (
         // Using 'require' which is like using 'assert' but causes tests to fail.
         assert "github.com/stretchr/testify/require"
 
         "skia.googlesource.com/buildbot.git/go/database"
         "skia.googlesource.com/buildbot.git/go/database/testutil"
         "skia.googlesource.com/buildbot.git/golden/go/db"
         "skia.googlesource.com/buildbot.git/golden/go/types"
 )
 
-func TestExpectationStores(t *testing.T) {
-        // Test the memory store.
-        memStore := NewMemExpectationsStore()
-        testExpectationStore(t, memStore)
+func TestMySQLExpectationsStore(t *testing.T) {
+        // Set up the test database.
+        testDb := testutil.SetupMySQLTestDatabase(t, db.MigrationSteps())
+        defer testDb.Close()
 
-        // Initialize the DB to use a local SQLite instances.
-        vdb := database.NewVersionedDB(&database.DatabaseConfig{
-                SQLiteFilePath: "correctness.db",
-                MigrationSteps: db.MigrationSteps(),
-        })
-        sqlStore := NewSQLExpectationStore(vdb)
-        testExpectationStore(t, sqlStore)
-}
-
-func TestMySQLExpecatationsStore(t *testing.T) {
-        // Set up the database and make sure it's at the right version.
-        conf := &database.DatabaseConfig{
-                MySQLString:    testutil.GetTestMySQLConnStr(t, "root", "correctness"),
-                MigrationSteps: db.MigrationSteps(),
-        }
-
-        // Lock to serialize DB tests
-        lockVdb := testutil.GetMySQlLock(t, conf)
-        defer func() {
-                testutil.ReleaseMySQLLock(t, lockVdb)
-                lockVdb.Close()
-        }()
-
-        rootVdb := database.NewVersionedDB(conf)
-        rootVdb.Migrate(rootVdb.MaxDBVersion())
-        defer func() {
-                rootVdb.Migrate(0)
-        }()
-
-        conf.MySQLString = testutil.GetTestMySQLConnStr(t, "readwrite", "correctness")
+        conf := testutil.LocalTestDatabaseConfig(db.MigrationSteps())
         vdb := database.NewVersionedDB(conf)

[jcgregorio, 2014/12/19 20:27:06]

Why not make MySQLTestDatabase rootVdb public and then replace vdb with
testDb.RootVdb?

[borenet, 2014/12/19 20:39:15]

That would work, but the test would be running as the root user.  May not matter
but does matter for others (like the database versioning tests).  I actually
prefer forcing the test to decide for itself.

 
         // Test the MySQL backed store
         sqlStore := NewSQLExpectationStore(vdb)
         testExpectationStore(t, sqlStore)
 
         // Test the caching version of the MySQL store.
         cachingStore := NewCachingExpectationStore(sqlStore)
         testExpectationStore(t, cachingStore)
 }
 
@@ skipping 42 matching lines @@
         assert.Equal(t, types.TestClassification(map[string]types.Label{DIGEST_21: types.POSITIVE}), foundExps.Tests[TEST_2])
 
         changeExps.RemoveDigests([]string{DIGEST_12})
         err = store.Put(changeExps, "user-3")
         assert.Nil(t, err)
 
         foundExps, err = store.Get(false)
         assert.Nil(t, err)
         assert.Equal(t, 1, len(foundExps.Tests))
 }