From 7e29b8a770a45b68638f5dba9ad58b755ccb4749 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 20 Aug 2016 20:58:49 +0100 Subject: Run some tests in parallel --- server/certutil/util_test.go | 1 + server/config/config_test.go | 3 +++ server/signer/signer_test.go | 2 ++ server/store/config_test.go | 2 ++ server/store/store_test.go | 5 +++++ 5 files changed, 13 insertions(+) (limited to 'server') diff --git a/server/certutil/util_test.go b/server/certutil/util_test.go index abb8f10..df42b90 100644 --- a/server/certutil/util_test.go +++ b/server/certutil/util_test.go @@ -8,6 +8,7 @@ import ( ) func TestGetPublicKey(t *testing.T) { + t.Parallel() c, _, _, _, _ := ssh.ParseAuthorizedKey(testdata.Cert) if GetPublicKey(c.(*ssh.Certificate)) != string(testdata.Cert) { t.Fail() diff --git a/server/config/config_test.go b/server/config/config_test.go index 982e6e6..3a9d4c1 100644 --- a/server/config/config_test.go +++ b/server/config/config_test.go @@ -10,6 +10,7 @@ import ( ) func TestServerConfig(t *testing.T) { + t.Parallel() a := assert.New(t) c, err := ReadConfig(bytes.NewBuffer(testdata.ServerConfig)) if err != nil { @@ -26,6 +27,7 @@ func TestServerConfig(t *testing.T) { } func TestAuthConfig(t *testing.T) { + t.Parallel() a := assert.New(t) c, err := ReadConfig(bytes.NewBuffer(testdata.AuthConfig)) if err != nil { @@ -41,6 +43,7 @@ func TestAuthConfig(t *testing.T) { } func TestSSHConfig(t *testing.T) { + t.Parallel() a := assert.New(t) c, err := ReadConfig(bytes.NewBuffer(testdata.SSHConfig)) if err != nil { diff --git a/server/signer/signer_test.go b/server/signer/signer_test.go index 9c76f4b..5fbf2c6 100644 --- a/server/signer/signer_test.go +++ b/server/signer/signer_test.go @@ -24,6 +24,7 @@ var ( ) func TestCert(t *testing.T) { + t.Parallel() r := &lib.SignRequest{ Key: string(testdata.Pub), Principal: "gopher1", @@ -53,6 +54,7 @@ func TestCert(t *testing.T) { } func TestRevocationList(t *testing.T) { + t.Parallel() r := &lib.SignRequest{ Key: string(testdata.Pub), Principal: "revoked", diff --git a/server/store/config_test.go b/server/store/config_test.go index f262b57..9a77027 100644 --- a/server/store/config_test.go +++ b/server/store/config_test.go @@ -9,6 +9,7 @@ import ( ) func TestMySQLConfig(t *testing.T) { + t.Parallel() var tests = []struct { in string out []string @@ -26,6 +27,7 @@ func TestMySQLConfig(t *testing.T) { } func TestMongoConfig(t *testing.T) { + t.Parallel() var tests = []struct { in string out *mgo.DialInfo diff --git a/server/store/store_test.go b/server/store/store_test.go index 629230b..18fa0d1 100644 --- a/server/store/store_test.go +++ b/server/store/store_test.go @@ -17,6 +17,7 @@ import ( ) func TestParseCertificate(t *testing.T) { + t.Parallel() a := assert.New(t) now := uint64(time.Now().Unix()) r, _ := rsa.GenerateKey(rand.Reader, 1024) @@ -88,11 +89,13 @@ func testStore(t *testing.T, db CertStorer) { } func TestMemoryStore(t *testing.T) { + t.Parallel() db := NewMemoryStore() testStore(t, db) } func TestMySQLStore(t *testing.T) { + t.Parallel() config := os.Getenv("MYSQL_TEST_CONFIG") if config == "" { t.Skip("No MYSQL_TEST_CONFIG environment variable") @@ -105,6 +108,7 @@ func TestMySQLStore(t *testing.T) { } func TestMongoStore(t *testing.T) { + t.Parallel() config := os.Getenv("MONGO_TEST_CONFIG") if config == "" { t.Skip("No MONGO_TEST_CONFIG environment variable") @@ -117,6 +121,7 @@ func TestMongoStore(t *testing.T) { } func TestSQLiteStore(t *testing.T) { + t.Parallel() f, err := ioutil.TempFile("", "sqlite_test_db") if err != nil { t.Error(err) -- cgit v1.2.3